/[BackupPC]/trunk/lib/BackupPC/SearchLib.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/lib/BackupPC/SearchLib.pm

Parent Directory | Revision Log | View Patch Patch

-revision 79 by dpavlin,
Fri Aug 26 23:37:10 2005 UTC
+revision 84 by dpavlin,
Sun Aug 28 10:20:31 2005 UTC
 Line 15 
 my $pager_pages = 10;
  my $dsn = $Conf{SearchDSN};
  my $db_user = $Conf{SearchUser} || '';
+ my $dbh;
+ sub get_dbh {
+         $dbh ||= DBI->connect($dsn, $db_user, "", { RaiseError => 1, AutoCommit => 1 } );
+         return $dbh;
+ }
  sub getUnits() {
          my @ret;
-         my $dbh = DBI->connect($dsn, $db_user, "", { RaiseError => 1, AutoCommit => 1 } );
+         my $dbh = get_dbh();
          my $sth = $dbh->prepare(qq{ SELECT id, share FROM shares ORDER BY share} );
          $sth->execute();
          push @ret, { 'id' => '', 'share' => '-'};       # dummy any
-Line 26 
 sub getUnits() {
+Line 33 
 sub getUnits() {
          while ( my $row = $sth->fetchrow_hashref() ) {
                  push @ret, $row;
          }
-         $dbh->disconnect();
          return @ret;
  }
-Line 37 
 sub epoch_to_iso {
+Line 43 
 sub epoch_to_iso {
          return $iso;
  }
- sub getWhere($) {
+ sub dates_from_form($) {
-         my ($param)    = @_;
+         my $param = shift || return;
-         my @conditions;
          sub mk_epoch_date($$) {
                  my ($name,$suffix) = @_;
-Line 57 
 sub getWhere($) {
+Line 62 
 sub getWhere($) {
                  return $dt->epoch || 'NULL';
          }
-         my $backup_from = mk_epoch_date('search_backup', 'from');
+         return (
+                 mk_epoch_date('search_backup', 'from'),
+                 mk_epoch_date('search_backup', 'to'),
+                 mk_epoch_date('search', 'from'),
+                 mk_epoch_date('search', 'to'),
+         );
+ }
+ sub getWhere($) {
+         my $param = shift || return;
+         my ($backup_from, $backup_to, $files_from, $files_to) = dates_from_form($param);
+         my @conditions;
          push @conditions, qq{ backups.date >= $backup_from } if ($backup_from);
-         my $backup_to = mk_epoch_date('search_backup', 'to');
          push @conditions, qq{ backups.date <= $backup_to } if ($backup_to);
-         my $files_from = mk_epoch_date('search', 'from');
          push @conditions, qq{ files.date >= $files_from } if ($files_from);
-         my $files_to = mk_epoch_date('search', 'to');
          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);
-         push( @conditions, ' files.shareid = ' . $param->{'search_share'} ) if ($param->{'search_share'});
+         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'});
-         return (
+         return join(" and ", @conditions);
-                 join(" and ", @conditions),
-                 $files_from, $files_to,
-                 $backup_from, $backup_to
-         );
  }
  sub getFiles($$) {
-         my ($where, $offset) = @_;
+         my ($param, $offset) = @_;
-         my $dbh = DBI->connect($dsn, $db_user, "", { RaiseError => 1, AutoCommit => 1 } );
+         my $dbh = get_dbh();
          my $sql_cols = qq{
                  files.id                        AS fid,
-Line 113 
 sub getFiles($$) {
+Line 123 
 sub getFiles($$) {
          };
          my $sql_where;
+         my $where = getWhere($param);
          $sql_where = " WHERE ". $where if ($where);
          my $sql_order = qq{
-Line 160 
 sub getFiles($$) {
+Line 171 
 sub getFiles($$) {
          }
          $sth->finish();
-         $dbh->disconnect();
          return ($results, \@ret);
  }
  sub getBackupsNotBurned() {
-         my $dbh = DBI->connect($dsn, $db_user, "", { RaiseError => 1, AutoCommit => 1 } );
+         my $dbh = get_dbh();
          my $sql = q{
          SELECT
                  backups.hostID          AS hostid,
-Line 231 
 EOF3
+Line 241 
 EOF3
                $retHTML .= q{<input type="hidden" value="results" name="search_results">};
          }
          $retHTML .= qq{
-                 <table style="fview" border="1" cellspacing="1" cellpadding="3">
+                 <table style="fview" border="1" cellspacing="0" cellpadding="3">
                  <tr class="tableheader">
          };
-Line 289 
 EOF3
+Line 299 
 EOF3
          return $retHTML;
  }
- sub displayGrid($$$$) {
+ sub displayGrid($$) {
-         my ($where, $addForm, $offset, $hilite) = @_;
+         my ($param, $addForm) = @_;
+         my $offset = $param->{'offset'};
+         my $hilite = $param->{'search_filename'};
          my $retHTML = "";
          my $start_t = time();
-         my ($results, $files) = getFiles($where, $offset);
+         my ($results, $files) = getFiles($param, $offset);
          my $dur_t = time() - $start_t;
          my $dur = sprintf("%0.4fs", $dur_t);
-Line 357 
 sub displayGrid($$$$) {
+Line 371 
 sub displayGrid($$$$) {
                  $retHTML .=
                          qq{<td class="fviewborder" align="right">} . $file->{'sharename'} . qq{</td>} .
-                         qq{<td class="fviewborder"><img src="$Conf{CgiImageDirURL}/icon-$typeStr.gif" alt="$typeStr">&nbsp;} . hilite_html( $file->{'fpath'}, $hilite ) . qq{</td>} .
+                         qq{<td class="fviewborder"><img src="$Conf{CgiImageDirURL}/icon-$typeStr.gif" alt="$typeStr" align="middle">&nbsp;} . hilite_html( $file->{'fpath'}, $hilite ) . qq{</td>} .
                          qq{<td class="fviewborder" align="center">} . restore_link( $typeStr, ${EscURI( $file->{'hname'} )}, $file->{'backupno'}, ${EscURI( $file->{'sname'})}, ${EscURI( $file->{'fpath'} )}, $file->{'backupno'} ) . qq{</td>} .
                          qq{<td class="fviewborder" align="right">} . $file->{'size'} . qq{</td>} .
                          qq{<td class="fviewborder">} . epoch_to_iso( $file->{'date'} ) . qq{</td>} .

 Legend:



Removed from v.79
 


changed lines


 
Added in v.84
 Legend:



Removed from v.79
 


changed lines


 
Added in v.84
-Removed from v.79
+Added in v.84

	ViewVC Help
Powered by ViewVC 1.1.26