--- trunk/lib/BackupPC/SearchLib.pm	2005/10/10 14:32:31	171
+++ trunk/lib/BackupPC/SearchLib.pm	2005/10/12 12:53:27	186
@@ -68,10 +68,20 @@
 		$mm =~ s/\D//g;
 		$dd =~ s/\D//g;
 
+		my $h = my $m = my $s = 0;
+		if ($suffix eq 'to') {
+			$h = 23;
+			$m = 59;
+			$s = 59;
+		}
+
 		my $dt = new DateTime(
 			year => $yyyy,
 			month => $mm,
-			day => $dd
+			day => $dd,
+			hour => $h,
+			minute => $m,
+			second => $s,
 		);
 		print STDERR "mk_epoch_date($name,$suffix) [$yyyy-$mm-$dd] = " . $dt->ymd . " " . $dt->hms . "\n";
 		return $dt->epoch || 'NULL';
@@ -100,7 +110,7 @@
 	push @conditions, qq{ files.date >= $files_from } if ($files_from);
 	push @conditions, qq{ files.date <= $files_to } if ($files_to);
 
-	print STDERR "backup: $backup_from - $backup_to files: $files_from - $files_to cond:" . join(" | ",@conditions);
+	print STDERR "backup: $backup_from - $backup_to files: $files_from - $files_to cond:" . join(" and ",@conditions);
 
     	push( @conditions, ' files.shareid = ' . $param->{'search_share'} ) if ($param->{'search_share'});
 	push (@conditions, " upper(files.path) LIKE upper('%".$param->{'search_filename'}."%')") if ($param->{'search_filename'});