[BACK]Return to zlist CVS log [TXT][DIR] Up to [local] / wpscripts / zlist

Diff for /wpscripts/zlist/zlist between version 1.1 and 1.2

version 1.1, 2011/06/03 09:28:47 version 1.2, 2011/07/19 16:12:10
Line 7 
Line 7 
 $| = 1;  $| = 1;
   
 # database  # database
 our $server = "MSSQL";  our $server = "pdc";
 our $user = "it_men";  our $user = "sa";
 our $pass = "itmen712";  our $pass = "aekghbynflvby";
 our $dsn = "DBI:Sybase:server=$server";  our $dsn = "DBI:Sybase:server=$server";
 our $sth;  our $sth;
   
Line 46 
Line 46 
 }  }
 else  else
 {  {
         if( -e "/var/log/ztransfer/FILE" && -e "/var/log/ztransfer/ACTION")          if( -e "/var/log/wpscripts/ztransfer/FILE" && -e "/var/log/ztransfer/ACTION")
         {          {
             open(CURRENT, "/var/log/ztransfer/FILE");              open(CURRENT, "/var/log/wpscripts/ztransfer/FILE");
             my $file = <CURRENT>;              my $file = <CURRENT>;
             close(CURRENT);              close(CURRENT);
   
             open(CURRENT, "/var/log/ztransfer/ACTION");              open(CURRENT, "/var/log/wpscripts/ztransfer/ACTION");
             my $action = <CURRENT>;              my $action = <CURRENT>;
             close(CURRENT);              close(CURRENT);
   
Line 79 
Line 79 
 print "\n";  print "\n";
   
   
     # fetch jpegs  
     db_fetch(1);  
   
 #    print "****** jpegs ($#numcard) ******\n";  
     print  BOLD WHITE ON_BLUE "Очередь джепегов". RESET . " ($#numcard штук) :\n";  
         $i = 0;  
         while( ($numcard[$i]) )  
         {  
             print "$numcard[$i]\t[ оформлено $time[$i],  приоритет=$pri[$i],  файл=$path[$i] (размер=$size[$i]) ]\n";  
             $i++;  
             $total++;  
         }  
     print "\n";  
   
   
         # fetch probas          # fetch probas
         db_fetch(2);          db_fetch(2);
   
Line 126 
Line 111 
   
 sub db_select()  sub db_select()
 {  {
     $dbh->do("use Manager");      $dbh->do("use full_print");
 }  }
   
   
Line 136 
Line 121 
     my $i = 0;      my $i = 0;
     my $searchpath;      my $searchpath;
   
     $sth = $dbh->prepare ("SELECT NumCard,Path,time_file,file_priority,tx_count FROM upload_files WHERE Status=0 AND type_file=$type_file") or die "SQL prepare failed\n";      $sth = $dbh->prepare ("SELECT numcard,path,time_file,file_priority,tx_count FROM upload_files WHERE status=0 AND type_file=$type_file") or die "SQL prepare failed\n";
     $sth->execute( ) or die "unable to execute query $query   error $DBI::errstr";      $sth->execute( ) or die "unable to execute query $query   error $DBI::errstr";
   
     # zero elements      # zero elements
Line 161 
Line 146 
             # make local file path              # make local file path
             $searchpath =~ tr/\\/\//; $searchpath = '/WIDEPRINT/' . $searchpath;              $searchpath =~ tr/\\/\//; $searchpath = '/WIDEPRINT/' . $searchpath;
   
             # follow symlink to achieve real path  #           # follow symlink to achieve real path
             chomp( $_ = `dirname $searchpath | xargs /usr/bin/readlink` ); chomp( $searchpath = $_ . '/' . `basename $searchpath` );  #           chomp( $_ = `dirname $searchpath | xargs /usr/bin/readlink` ); chomp( $searchpath = $_ . '/' . `basename $searchpath` );
   
             # finally, get file size              # finally, get file size
             $size[$i] = -s $searchpath;              $size[$i] = -s $searchpath;

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2

CVSweb