===================================================================
RCS file: /cvs/wpscripts/ztransfer/fetch.pm,v
retrieving revision 1.2
retrieving revision 1.5
diff -u -r1.2 -r1.5
--- wpscripts/ztransfer/fetch.pm	2011/07/20 07:50:57	1.2
+++ wpscripts/ztransfer/fetch.pm	2011/07/22 07:43:56	1.5
@@ -1,10 +1,10 @@
 #!/usr/bin/perl
-# $Id: fetch.pm,v 1.2 2011/07/20 07:50:57 yason Exp $
+# $Id: fetch.pm,v 1.5 2011/07/22 07:43:56 yason Exp $
 package fetch;
 use db;
 use log;  # bad! only for log::filelist()
 use warnings;
-my $EXPAND_SYMLINKS = 1;
+#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";
 
@@ -39,21 +39,21 @@
 	    #convert samba-paths to local unix paths
 	    $dbpaths[$i] = substr($dbpaths[$i], 13);	# remove \\fileserver\
 	    $dbpaths[$i] =~ tr/\\/\//;			# convert each \ to /
-	    $dbpaths[$i] = '/mnt/rmt_maket/' . $dbpaths[$i];
+	    $dbpaths[$i] = '/mnt/maket/' . $dbpaths[$i];
 	    $dbpaths[$i] = substr($dbpaths[$i], 0, ( index($dbpaths[$i], ' ', 0) ) );
 		#
 		# We must not save non-existent local file in array!
 		# 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($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
 	}
 	else
@@ -92,38 +92,6 @@
 }
 
 
-sub jpegs_list()
-{
-    my @dbids;
-    my @dbpaths;
-    my $i = 0;
-    
-    $sth = $db::dbh->prepare($QUERY_J);
-    $sth->execute( );
-    while(($dbids[$i], $dbpaths[$i]) = $sth->fetchrow_array( ) )
-    {
-	$dbpaths[$i] = substr($dbpaths[$i], 23);
-	$dbpaths[$i] =~ tr/\\/\//;
-	$dbpaths[$i] = '/WIDEPRINT/' . $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++;
-    }
-
-    $i--;
-    $#dbids = $i;
-    $#dbpaths = $i;
-
-    log::filelist(\@dbpaths);
-    
-    return( (\@dbids, \@dbpaths) );
-}
-
-
 sub probas_list()
 {
     my @dbids;
@@ -134,15 +102,15 @@
     $sth->execute( );
     while(($dbids[$i], $dbpaths[$i]) = $sth->fetchrow_array( ) )
     {
-	$dbpaths[$i] = substr($dbpaths[$i], 23);
+	$dbpaths[$i] = substr($dbpaths[$i], 13);
 	$dbpaths[$i] =~ tr/\\/\//;
-	$dbpaths[$i] = '/WIDEPRINT/' . $dbpaths[$i];
+	$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]` );
-	    }
+#	    if($EXPAND_SYMLINKS && -e $dbpaths[$i])
+#	    {
+#		chomp( $_ = `dirname $dbpaths[$i] | xargs /usr/bin/readlink` );
+#		chomp( $dbpaths[$i] = $_ . '/' . `basename $dbpaths[$i]` );
+#	    }
 	$i++;
     }
 
@@ -152,38 +120,6 @@
 
     log::filelist(\@dbpaths);
 
-    
-    return( (\@dbids, \@dbpaths) );
-}
-
-
-sub tpps_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], 23);
-	$dbpaths[$i] =~ tr/\\/\//;
-	$dbpaths[$i] = '/WIDEPRINT/' . $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++;
-    }
-
-    $i--;
-    $#dbids = $i;
-    $#dbpaths = $i;
-
-    log::filelist(\@dbpaths);
     
     return( (\@dbids, \@dbpaths) );
 }