===================================================================
RCS file: /cvs/wpscripts/zlist/zlist,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wpscripts/zlist/zlist	2011/12/21 09:33:05	1.8
+++ wpscripts/zlist/zlist	2012/02/02 07:41:05	1.9
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: zlist,v 1.8 2011/12/21 09:33:05 yason Exp $
+# $Id: zlist,v 1.9 2012/02/02 07:41:05 yason Exp $
 use DBI;
 use Term::ANSIColor qw(:constants);
 use Time::HiRes qw(gettimeofday tv_interval);
@@ -106,10 +106,10 @@
 	}
 print "\n";
 
-# fetch jpeg
+# fetch zayavki_
 db_fetch(3);
 
-print BOLD WHITE ON_BLUE "jpeg queue". RESET . " ($#numcard pcs.) :\n";
+print BOLD WHITE ON_BLUE "zayavki_ queue". RESET . " ($#numcard pcs.) :\n";
 	$i = 0;
 	while( ($numcard[$i]) )
 	{
@@ -119,7 +119,20 @@
 	}
 print "\n";
 
+# fetch proba_
+db_fetch(4);
 
+print BOLD WHITE ON_BLUE "proba_ 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 . "Total: " . RESET . "$total files in queue.\n";
 
@@ -170,7 +183,8 @@
 	$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
+	$path[$i] = substr($path[$i], 22) if ($type_file == 3); #zayavki_
+	$path[$i] = substr($path[$i], 19) if ($type_file == 4); #proba_
 
     	    # make local file path
 	    $searchpath =~ tr/\\/\//;