--- trunk/Nos.pm	2005/08/24 21:27:40	75
+++ trunk/Nos.pm	2005/08/29 14:53:53	83
@@ -27,6 +27,7 @@
 use Email::Address;
 use Mail::DeliveryStatus::BounceParser;
 use Class::DBI::AbstractSearch;
+use SQL::Abstract;
 use Mail::Alias;
 use Cwd qw(abs_path);
 
@@ -116,20 +117,6 @@
 
 	$self->{'hash_len'} ||= 8;
 
-	$self->{'loader'}->find_class('received')->set_sql(
-		'received' => qq{
-			select
-				received.id as id,
-				lists.name as list,
-				users.ext_id as ext_id,
-				users.email as email,
-				bounced,received.date as date
-			from received
-			join lists on lists.id = list_id
-			join users on users.id = user_id
-		},
-	);
-
 	$self ? return $self : return undef;
 }
 
@@ -722,28 +709,94 @@
 
 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,
  );
 
-This method is used by C<sender.pl> when receiving e-mail messages.
+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
+	email => 'jdoe@example.com',	# e-mail of message sender
+	bounced => 0,			# true if message is bounce
+	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
 
 sub received_messages {
 	my $self = shift;
 
-	my $arg = {@_};
+	my $arg = {@_} if (@_);
 
-	croak "need list name or email" unless ($arg->{'list'} || $arg->{'email'});
+#	croak "need list name or email" unless ($arg->{'list'} || $arg->{'email'});
 
-	$arg->{'list'} = lc($arg->{'list'});
-	$arg->{'email'} = lc($arg->{'email'});
+	my $sql = qq{
+			select
+				received.id as id,
+				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 $rcvd = $self->{'loader'}->find_class('received')->search_received();
+	my $order = qq{	order by date asc };
 
-	return $rcvd;
+	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 . $order);
+	$sth->execute(@bind);
+	return $sth->fetchall_hash;
 }
 
 
@@ -813,7 +866,10 @@
 	$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;
@@ -1139,44 +1195,41 @@
 	}
 }
 
-=head1 UNIMPLEMENTED FUNCTIONS
-
-This is a stub for documentation of unimplemented functions.
-
 =head2 MessagesReceived
 
+Return statistics about received messages.
+
  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 can specify just 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.
 
-It will return array of hashes with following structure:
-
- {
-	id => 42,			# unique ID of received message
-	list => 'My list',		# useful only of filtering by email
-	ext_id => 9999,			# ext_id from message user
-	email => 'jdoe@example.com',	# e-mail of user
-	bounced => 0,			# true value if message is bounce
-	date => '2005-08-24 18:57:24',	# date of recival in ISO format
- }
-
-=head2 MessagesReceivedByDate
-
-=head2 MessagesReceivedByDateWithContent
-
-=head2 ReceivedMessasgeContent
-
-Return content of received message.
-
- my $mail_body = ReceivedMessageContent( id => 42 );
+For format of returned array element see C<received_messages>.
 
 =cut
 
+sub MessagesReceived {
+	my $self = shift;
 
-
+	if ($_[0] !~ m/^HASH/) {
+		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 = shift;
+		die "need list or email argument" unless ($arg->{'list'} || $arg->{'email'});
+		return $nos->received_messages( %{ $arg } );
+	}
+}
 
 ###