/[notice-sender]/trunk/Nos.pm

This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!

Diff of /trunk/Nos.pm

Parent Directory | Revision Log | View Patch Patch

-revision 78 by dpavlin,
Thu Aug 25 00:56:06 2005 UTC
+revision 83 by dpavlin,
Mon Aug 29 14:53:53 2005 UTC
 Line 709 
 sub inbox_message {
  Returns all received messages for given list or user.
-  my @received = $nos->received_message(
+  my @received = $nos->received_messages(
          list => 'My list',
          email => "john.doe@example.com",
+         from_date => '2005-01-01 10:15:00',
+         to_date => '2005-01-01 12:00:00',
+         message => 0,
   );
+ If don't specify C<list> or C<email> it will return all received messages.
+ Results will be sorted by received date, oldest first.
+ Other optional parametars include:
+ =over 10
+ =item from_date
+ Date (in ISO format) for lower limit of dates received
+ =item to_date
+ Return just messages older than this date
+ =item message
+ Include whole received message in result. This will probably make result
+ array very large. Use with care.
+ =back
+ Date ranges are inclusive, so results will include messages sent on
+ particular date specified with C<date_from> or C<date_to>.
  Each element in returned array will have following structure:
-  {
+  my $row = {
          id => 42,                       # unique ID of received message
          list => 'My list',              # useful if filtering by email
          ext_id => 9999,                 # ext_id from message sender
-Line 725 
 Each element in returned array will have
+Line 753 
 Each element in returned array will have
          date => '2005-08-24 18:57:24',  # date of receival in ISO format
   }
+ If you specified C<message> option, this hash will also have C<message> key
+ which will contain whole received message.
  =cut
-Line 741 
 sub received_messages {
+Line 771 
 sub received_messages {
                                  lists.name as list,
                                  users.ext_id as ext_id,
                                  users.email as email,
+         };
+         $sql .= qq{             message,} if ($arg->{'message'});
+         $sql .= qq{
                                  bounced,received.date as date
                          from received
                          join lists on lists.id = list_id
                          join users on users.id = user_id
          };
+         my $order = qq{ order by date asc };
          my $where;
          $where->{'lists.name'} = lc($arg->{'list'}) if ($arg->{'list'});
          $where->{'users.email'} = lc($arg->{'email'}) if ($arg->{'email'});
+         $where->{'received.date'} = { '>=', $arg->{'date_from'} } if ($arg->{'date_from'});
+         $where->{'received.date'} = { '<=', $arg->{'date_to'} } if ($arg->{'date_to'});
          # hum, yammy one-liner
          my($stmt, @bind)  = SQL::Abstract->new->where($where);
          my $dbh = $self->{'loader'}->find_class('received')->db_Main;
-         my $sth = $dbh->prepare($sql . $stmt);
+         my $sth = $dbh->prepare($sql . $stmt . $order);
          $sth->execute(@bind);
          return $sth->fetchall_hash;
  }
-Line 829 
 sub _add_aliases {
+Line 866 
 sub _add_aliases {
          $self_path =~ s#/[^/]+$##;
          $self_path =~ s#/t/*$#/#;
-         $target .= qq#| cd $self_path && ./sender.pl --inbox="$list"#;
+         $target .= qq#"| cd $self_path && ./sender.pl --inbox='$list'"#;
+         # remove hostname from email to make Postfix's postalias happy
+         $email =~ s/@.+//;
          if ($a->exists($email)) {
                  $a->update($email, $target) or croak "can't update alias ".$a->error_check;
-Line 1162 
 Return statistics about received message
+Line 1202 
 Return statistics about received message
   my @result = MessagesReceived(
          list => 'My list',
          email => 'jdoe@example.com',
+         from_date => '2005-01-01 10:15:00',
+         to_date => '2005-01-01 12:00:00',
+         message => 0,
   );
- You must specify C<list> or C<email> or any combination of those.
+ You must specify C<list> or C<email> or any combination of those two. Other
+ parametars are optional.
  For format of returned array element see C<received_messages>.
-Line 1174 
 sub MessagesReceived {
+Line 1218 
 sub MessagesReceived {
          my $self = shift;
          if ($_[0] !~ m/^HASH/) {
-                 die "need both list and email" unless (scalar @_ < 2);
+                 die "need at least list or email" unless (scalar @_ < 2);
                  return $nos->received_messages(
                          list => $_[0], email => $_[1],
+                         from_date => $_[2], to_date => $_[3],
+                         message => $_[4]
                  );
          } else {
-                 my $arg = {@_};
+                 my $arg = shift;
-                 die "need both list and email" unless ($arg->{'list'} && $arg->{'email'});
+                 die "need list or email argument" unless ($arg->{'list'} || $arg->{'email'});
-                 return $nos->received_messages( $arg );
+                 return $nos->received_messages( %{ $arg } );
          }
  }
  ###
- =head1 UNIMPLEMENTED SOAP FUNCTIONS
- This is a stub for documentation of unimplemented functions.
- =head2 MessagesReceivedByDate
- =head2 MessagesReceivedByDateWithContent
- =head2 ReceivedMessageContent
- Return content of received message.
-  my $mail_body = ReceivedMessageContent( id => 42 );
  =head1 NOTE ON ARRAYS IN SOAP
  Returning arrays from SOAP calls is somewhat fuzzy (at least to me). It

 Legend:



Removed from v.78
 


changed lines


 
Added in v.83
 Legend:



Removed from v.78
 


changed lines


 
Added in v.83
-Removed from v.78
+Added in v.83

	ViewVC Help
Powered by ViewVC 1.1.26