--- trunk/sender.pl 2005/05/15 22:12:31 23 +++ trunk/sender.pl 2005/05/15 22:30:54 24 @@ -140,31 +140,17 @@ if ($queue_opt ne '') { # add message to list queue - my $this_list = $lists->search( - name => $queue_opt, - )->first || die "can't find list $queue_opt"; - my $message_text; while(<>) { $message_text .= $_; } - die "no message" unless ($message_text); - - my $this_message = $messages->find_or_create({ - message => $message_text - }) || die "can't insert message"; - - $this_message->dbi_commit() || die "can't add message"; - - $queue->find_or_create({ - message_id => $this_message->id, - list_id => $this_list->id, - }) || die "can't add message ",$this_message->id," to list ",$this_list->id, ": ",$this_list->name; - - $queue->dbi_commit || die "can't add message to list ",$this_list->name; + my $id = $nos->add_message_to_queue( + list => $queue_opt, + message => $message_text, + ); - print "added message ",$this_message->id, " to list ",$this_list->name,"\n"; + print "added message $id to list $queue_opt\n"; } else { # list messages in queue