===================================================================
RCS file: /cvs/wpscripts/zlist/zlist,v
retrieving revision 1.1.1.1
retrieving revision 1.8
diff -u -r1.1.1.1 -r1.8
--- wpscripts/zlist/zlist	2011/06/03 09:28:47	1.1.1.1
+++ wpscripts/zlist/zlist	2011/12/21 09:33:05	1.8
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: zlist,v 1.1.1.1 2011/06/03 09:28:47 yason Exp $
+# $Id: zlist,v 1.8 2011/12/21 09:33:05 yason Exp $
 use DBI;
 use Term::ANSIColor qw(:constants);
 use Time::HiRes qw(gettimeofday tv_interval);
@@ -7,9 +7,9 @@
 $| = 1;
 
 # database
-our $server = "MSSQL";
-our $user = "it_men";
-our $pass = "itmen712";
+our $server = "pdc";
+our $user = "sa";
+our $pass = "aekghbynflvby";
 our $dsn = "DBI:Sybase:server=$server";
 our $sth;
 
@@ -38,79 +38,90 @@
 
 my $time2 = [gettimeofday];
 
-print GREEN "Время отклика от базы данных: " . tv_interval($time1, $time2) . " секунд\n". RESET;
+print GREEN "DB response time: " . tv_interval($time1, $time2) . " seconds\n". RESET;
 
 if( ! -e "/var/run/ztransfer.lock")
 {
-	print YELLOW "ztransfer сейчас не запущен\n" . RESET;
+	print YELLOW "ztransfer is not running\n" . RESET;
 }
 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>;
 	    close(CURRENT);
 
-	    open(CURRENT, "/var/log/ztransfer/ACTION");
+	    open(CURRENT, "/var/log/wpscripts/ztransfer/ACTION");
 	    my $action = <CURRENT>;
 	    close(CURRENT);
 	    
 	    
 	    print "DEBUG: $file $action\n";
 	    
-	    print YELLOW "ztransfer выполняется [ " . ($action eq 'rar' ? "сжимается " : "копируется ") . "$file ]\n" . RESET;
+	    print YELLOW "ztransfer is running [ " . ($action eq 'rar' ? "compressing " : "copying ") . "$file ]\n" . RESET;
 	}
 	else
 	{
-	    print YELLOW "ztransfer выполняется\n" . RESET;
+	    print YELLOW "ztransfer is running\n" . RESET;
 	}
 }
 
 # print out zayavki info
-print BOLD WHITE ON_BLUE "Очередь заявок". RESET . " ($#numcard штук) :\n";
+print BOLD WHITE ON_BLUE "Zayavki queue". RESET . " ($#numcard pcs.) :\n";
     $i = 0;
     while( ($numcard[$i]) )
     {
-	print "$numcard[$i]\t[ оформлено $time[$i],  приоритет=$pri[$i],  файл=$path[$i] (размер=$size[$i]), счётчик передач=$tx_count[$i] ]\n";
+	print "$numcard[$i]\t[ executed $time[$i],  priority=$pri[$i],  file=$path[$i] (size=$size[$i]), transfer counter=$tx_count[$i] ]\n";
 	$i++;
 	$total++;
     }
 print "\n";
 
 
-    # fetch jpegs
-    db_fetch(1);
-    
-#    print "****** jpegs ($#numcard) ******\n";
-    print  BOLD WHITE ON_BLUE "Очередь джепегов". RESET . " ($#numcard штук) :\n";
+# fetch probas
+db_fetch(1);
+	
+#print "****** probas ($#numcard) ******\n";
+print BOLD WHITE ON_BLUE "Probas queue". RESET . " ($#numcard pcs.) :\n";
 	$i = 0;
 	while( ($numcard[$i]) )
 	{
-	    print "$numcard[$i]\t[ оформлено $time[$i],  приоритет=$pri[$i],  файл=$path[$i] (размер=$size[$i]) ]\n";
+	    print "$numcard[$i]\t[ executed $time[$i],  priority=$pri[$i],  file=$path[$i] (size=$size[$i]) ]\n";
 	    $i++;
 	    $total++;
 	} 
-    print "\n";
+print "\n";
 
+# fetch TT
+db_fetch(2);
 
-	# fetch probas
-	db_fetch(2);
-	
-#	print "****** probas ($#numcard) ******\n";
-	print BOLD WHITE ON_BLUE "Очередь цветопроб". RESET . " ($#numcard штук) :\n";
+print BOLD WHITE ON_BLUE "TT queue". RESET . " ($#numcard pcs.) :\n";
 	$i = 0;
 	while( ($numcard[$i]) )
 	{
-	    print "$numcard[$i]\t[ оформлено $time[$i],  приоритет=$pri[$i],  файл=$path[$i] (размер=$size[$i]) ]\n";
-	    $i++;
-	    $total++;
-	} 
-	print "\n";
+		print "$numcard[$i]\t[ executed $time[$i],  priority=$pri[$i],  file=$path[$i] (size=$size[$i]) ]\n";
+		$i++;
+		$total++;
+	}
+print "\n";
 
+# fetch jpeg
+db_fetch(3);
 
+print BOLD WHITE ON_BLUE "jpeg queue". RESET . " ($#numcard pcs.) :\n";
+	$i = 0;
+	while( ($numcard[$i]) )
+	{
+		print "$numcard[$i]\t[ executed $time[$i],  priority=$pri[$i],  file=$path[$i] (size=$size[$i]) ]\n";
+		$i++;
+		$total++;
+	}
+print "\n";
+
+
 # print summary information
-print BOLD WHITE . "Всего: " . RESET . "$total файлов в очереди на копирование в Заборье.\n";
+print BOLD WHITE . "Total: " . RESET . "$total files in queue.\n";
 
 # close connection
 db_disconnect();
@@ -126,7 +137,7 @@
 
 sub db_select()
 {
-    $dbh->do("use Manager");
+    $dbh->do("use full_print");
 }
 
 
@@ -136,7 +147,7 @@
     my $i = 0;
     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";
 
     # zero elements
@@ -151,25 +162,27 @@
 	} 
 	while( index($path[$i], ' ', 0) != -1 );
 	
-	$searchpath = substr($path[$i], 23);
+	# remove first 13 symbols in SMB path (\\fileserver\)
+	$searchpath = substr($path[$i], 13);
 	
 	# hardcoded
-	$path[$i] = substr($path[$i], 30) if ($type_file == 0);
-	$path[$i] = substr($path[$i], 34) if ($type_file == 1);
-	$path[$i] = substr($path[$i], 34) if ($type_file == 2);
+	# remove first symbols to get only filename (i.e. \\fileserver\zayavki\ - 21 symbols)
+	$path[$i] = substr($path[$i], 21) if ($type_file == 0); #zayavki
+	$path[$i] = substr($path[$i], 19) if ($type_file == 1); #proba
+	$path[$i] = substr($path[$i], 16) if ($type_file == 2); #TT
+	$path[$i] = substr($path[$i], 18) if ($type_file == 2); #jpeg
 
     	    # make local file path
-	    $searchpath =~ tr/\\/\//; $searchpath = '/WIDEPRINT/' . $searchpath;
-    	    
-	    # follow symlink to achieve real path
-	    chomp( $_ = `dirname $searchpath | xargs /usr/bin/readlink` ); chomp( $searchpath = $_ . '/' . `basename $searchpath` );
-	    
+	    $searchpath =~ tr/\\/\//; 
+	    $searchpath = '/mnt/maket/' . $searchpath;
+
+
 	    # finally, get file size
 	    $size[$i] = -s $searchpath;
 	    $size[$i] = ($size[$i] > 1048576 ? int($size[$i] / 1024 / 1024) . " MB" : int($size[$i] / 1024) . " KB");
 	    
 	    # this should work fine
-	    $size[$i] = WHITE ON_RED . "файл не найден" . RESET if (! -e $searchpath);
+	    $size[$i] = WHITE ON_RED . "File not found" . RESET if (! -e $searchpath);
     $i++;
     }