if ( $@ ) {
warn "ERROR: $search_module: $!";
} else {
- warn "# using $search_module for full-text search";
+ #warn "# using $search_module for full-text search";
}
return $search_module->new( %Conf );
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';
}
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);
}
# do we have to add tables for burned media?
if ( $param->{burned} ) {
$sql_from .= qq{
- LEFT OUTER JOIN archive_backup_parts on backup_id = backups.id
- LEFT OUTER JOIN archive_burned on archive_burned.archive_id = archive_id
+ LEFT OUTER JOIN backups_burned on backup_id = backups.id
};
}
my $order = getSort('search', 'sql', $param->{'sort'});
+ # XXX LIMIT $on_page doesn't work since we don't get correct number of results
my $sql_order = qq{
ORDER BY $order
- LIMIT $on_page
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);
- $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 $sth = $dbh->prepare($sql_results);
+ my $rows = $sth->execute( $offset );
my @ret;
-
+
while (my $row = $sth->fetchrow_hashref()) {
push @ret, $row;
+ last if $#ret + 1 >= $on_page;
}
$sth->finish();
- return ($results, \@ret);
+ return ($rows, \@ret);
}
sub getFilesHyperEstraier($) {