X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FSearch.pm;h=cbd8c84c02842962a8729624bb6681984ad7e89d;hp=a0e19c307e33d49ae8f2cdfe17c0bdfea941f0fe;hb=5da6f2d3b119993d9def86b5481a86ce6fd84059;hpb=fa8d82ef3f27cabb75318b9b646645973c83c429

diff --git a/lib/BackupPC/Search.pm b/lib/BackupPC/Search.pm
index a0e19c3..cbd8c84 100644
--- a/lib/BackupPC/Search.pm
+++ b/lib/BackupPC/Search.pm
@@ -79,31 +79,28 @@ sub dates_from_form($) {
 	sub mk_epoch_date($$) {
 		my ($name,$suffix) = @_;
 
-		my $yyyy = $param->{ $name . '_year_' . $suffix} || return undef;
-		my $mm .= $param->{ $name . '_month_' . $suffix} ||
-			( $suffix eq 'from' ? 1 : 12);
-		my $dd .= $param->{ $name . '_day_' . $suffix} ||
-			( $suffix eq 'from' ? 1 : 31);
+		my $yyyy = $param->{ $name . '_year_'  . $suffix}  || return undef;
+		my $mm   = $param->{ $name . '_month_' . $suffix};
+		my $dd   = $param->{ $name . '_day_'   . $suffix};
 
 		$yyyy =~ s/\D//g;
-		$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;
-		}
+		$mm   =~ s/\D//g;
+		$dd   =~ s/\D//g;
 
 		my $dt = new DateTime(
-			year => $yyyy,
-			month => $mm,
-			day => $dd,
-			hour => $h,
-			minute => $m,
-			second => $s,
+			year   => $yyyy,
+			month  => $mm || 1,
+			day    => $dd || 1,
+			hour   => 0,
+			minute => 0,
+			second => 0,
 		);
+		if ( $suffix eq 'to' && ( ! $mm || ! $dd ) ) {
+			$dt += DateTime::Duration->new( years  => 1 ) if ! $mm;
+			$dt += DateTime::Duration->new( months => 1 ) if ! $dd;
+			$dt -= DateTime::Duration->new( days   => 1 );
+		}
+
 		print STDERR "mk_epoch_date($name,$suffix) [$yyyy-$mm-$dd] = " . $dt->ymd . " " . $dt->hms . "\n";
 		return $dt->epoch || 'NULL';
 	}
@@ -136,12 +133,7 @@ sub getWhere($) {
     	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'});
 
-	if ( $param->{burned} ) {
-		my $is_what = 'is null';
-		$is_what = '= 1' if ($param->{burned} eq 'burned');
-		push @conditions, "archive_burned.part $is_what";
-		push @conditions, "archive_burned.copy $is_what";
-	}
+	push @conditions, join(' ' , 'burned is', $param->{burned} eq 'burned' ? '' : 'not', 'true') if $param->{burned};
 
 	return join(" and ", @conditions);
 }
@@ -229,8 +221,7 @@ sub getFiles($) {
 	# do we have to add tables for burned media?
 	if ( $param->{burned} ) {
 		$sql_from .= qq{
-			LEFT OUTER JOIN archive_backup on archive_backup.backup_id = backups.id
-			LEFT OUTER JOIN archive_burned on archive_burned.archive_id = archive_backup.archive_id
+			LEFT OUTER JOIN backups_burned on backup_id = backups.id
 		};
 	}
 
@@ -242,22 +233,10 @@ sub getFiles($) {
 		OFFSET ?
 	};
 
-	my $sql_count = qq{ select count(files.id) $sql_from $sql_where };
 	my $sql_results = qq{ select $sql_cols $sql_from $sql_where $sql_order };
-
-	my $sth = $dbh->prepare($sql_count);
-	$sth->execute();
-	my ($results) = $sth->fetchrow_array();
-
-	$sth = $dbh->prepare($sql_results);
+	my $sth = $dbh->prepare($sql_results);
 	$sth->execute( $offset );
 
-	if ($sth->rows != $results) {
-		my $bug = "$0 BUG: [[ $sql_count ]] = $results while [[ $sql_results ]] = " . $sth->rows;
-		$bug =~ s/\s+/ /gs;
-		print STDERR "$bug\n";
-	}
-
 	my @ret;
       
 	while (my $row = $sth->fetchrow_hashref()) {
@@ -265,7 +244,7 @@ sub getFiles($) {
 	}
      
 	$sth->finish();
-	return ($results, \@ret);
+	return ($sth->rows, \@ret);
 }
 
 sub getFilesHyperEstraier($) {
@@ -609,16 +588,16 @@ sub displayGrid($) {
 
 		$sth_archived ||= $dbh->prepare(qq{
 			select
-				dvd_nr, note,
+				archive.dvd_nr, note,
 				count(archive_burned.copy) as copies
 			from archive
 			inner join archive_burned on archive_burned.archive_id = archive.id
-			inner join archive_backup on archive.id = archive_backup.archive_id
-			inner join backups on backups.id = archive_backup.backup_id
+			inner join archive_backup_parts on archive.id = archive_backup_parts.archive_id
+			inner join backups on backups.id = archive_backup_parts.backup_id
 			inner join hosts on hosts.id = backups.hostid
 			inner join shares on shares.id = backups.shareid
 			where hosts.name = ? and shares.name = ? and backups.num = ?
-			group by dvd_nr, note
+			group by archive.dvd_nr, note
 		});
 
 		my @mediums;