===================================================================
RCS file: /cvs/wpscripts/ztransfer/fetch.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wpscripts/ztransfer/fetch.pm	2011/07/22 07:43:56	1.5
+++ wpscripts/ztransfer/fetch.pm	2011/08/30 08:30:41	1.6
@@ -1,12 +1,12 @@
 #!/usr/bin/perl
-# $Id: fetch.pm,v 1.5 2011/07/22 07:43:56 yason Exp $
+# $Id: fetch.pm,v 1.6 2011/08/30 08:30:41 yason Exp $
 package fetch;
 use db;
 use log;  # bad! only for log::filelist()
 use warnings;
-#my $EXPAND_SYMLINKS = 1;
 my $QUERY_Z = "SELECT ID,Path,file_priority FROM upload_files WHERE Status=0 AND type_file=0";
 my $QUERY_P = "SELECT ID,Path,file_priority FROM upload_files WHERE Status=0 AND type_file=1";
+my $QUERY_T = "SELECT ID,Path,file_priority FROM upload_files WHERE Status=0 AND type_file=2";
 
 my $sth;
 
@@ -46,15 +46,9 @@
 		# Returning of array with bad element is deprecated,
 		# So this code too weak to work correctly.
 		#
-#		if($EXPAND_SYMLINKS && -e $dbpaths[$i])
-#		{
-#		    chomp( $_ = `dirname $dbpaths[$i] | xargs /usr/bin/readlink` );
-#		    chomp( $dbpaths[$i] = $_ . '/' . `basename $dbpaths[$i]` );
-#		    
-#		    # increment $i ONLY if local file exists, otherwise replace element in next iteration
-#		    $i++;
-#		}
-		# if localfile does not exists, write result of next iteration on its place
+	# increment $i ONLY if local file exists, otherwise replace element in next iteration
+	    $i++;
+	# if localfile does not exists, write result of next iteration on its place
 	}
 	else
 	{
@@ -106,11 +100,6 @@
 	$dbpaths[$i] =~ tr/\\/\//;
 	$dbpaths[$i] = '/mnt/maket/' . $dbpaths[$i];
 	$dbpaths[$i] = substr($dbpaths[$i], 0, ( index($dbpaths[$i], ' ', 0) ) );
-#	    if($EXPAND_SYMLINKS && -e $dbpaths[$i])
-#	    {
-#		chomp( $_ = `dirname $dbpaths[$i] | xargs /usr/bin/readlink` );
-#		chomp( $dbpaths[$i] = $_ . '/' . `basename $dbpaths[$i]` );
-#	    }
 	$i++;
     }
 
@@ -123,6 +112,34 @@
     
     return( (\@dbids, \@dbpaths) );
 }
+
+sub tt_list()
+{
+    my @dbids;
+    my @dbpaths;
+    my $i = 0;
+
+    $sth = $db::dbh->prepare($QUERY_T);
+    $sth->execute( );
+    while(($dbids[$i], $dbpaths[$i]) = $sth->fetchrow_array( ) )
+    {
+        $dbpaths[$i] = substr($dbpaths[$i], 13);
+        $dbpaths[$i] =~ tr/\\/\//;
+        $dbpaths[$i] = '/mnt/maket/' . $dbpaths[$i];
+        $dbpaths[$i] = substr($dbpaths[$i], 0, ( index($dbpaths[$i], ' ', 0) ) );
+        $i++;
+    }
+
+    $i--;
+    $#dbids = $i;
+    $#dbpaths = $i;
+
+    log::filelist(\@dbpaths);
+
+
+    return( (\@dbids, \@dbpaths) );
+}
+
 
 
 return(1);