===================================================================
RCS file: /cvs/wpscripts/ztransfer/send.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wpscripts/ztransfer/send.pm	2011/06/03 11:03:41	1.2
+++ wpscripts/ztransfer/send.pm	2011/07/01 12:44:28	1.3
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: send.pm,v 1.2 2011/06/03 11:03:41 yason Exp $
+# $Id: send.pm,v 1.3 2011/07/01 12:44:28 yason Exp $
 package send;
 use fetch;
 use db;
@@ -85,12 +85,7 @@
 	else
 	{	
 	    # hardcoded
-	# how maket/rmt_maket could be used there?
-	    $remotepaths[$i] =~ s/V(1)/zV7/;
-	    $remotepaths[$i] =~ s/V(2)/zV8/;
-	    $remotepaths[$i] =~ s/V(3)/zV6/;
-	    $remotepaths[$i] =~ s/V(4)/zV7/;
-	    $remotepaths[$i] =~ s/V(5)/zV7/;
+	    $remotepaths[$i] =~ s/\/mnt\/maket/\/mnt\/rmt_maket/;
 	}
 	
 	if(-e $remotepaths[$i] || -e $remotepaths[$i] . '.rar')
@@ -224,101 +219,6 @@
 
 
 
-sub jpegs()
-{
-    my @dbids;
-    my @localpaths;
-    my @remotepaths;
-    my $dbids_ref;
-    my $localpaths_ref;
-    my $i = 0;
-    my $okay = 0;
-    
-    my $size_orig;
-    
-    ($dbids_ref, $localpaths_ref) = fetch::jpegs_list();
-
-    @dbids = @$dbids_ref;
-    @localpaths = @$localpaths_ref;
-    log::main("Fetched " . scalar(@localpaths) . " jpegs from database");
-    log::jpegs("<<  Starting transfer process  >>");
-    
-    @remotepaths = @localpaths;	 # clone
-
-    while($localpaths[$i])
-    {
-	# lookup in table first
-	chomp( $tmpf = `basename $remotepaths[$i]` );
-	chomp( $_ = `dirname $remotepaths[$i]` );
-	$tmpd = hash::lookup($_);
-	if ( $tmpd ne '' )
-	{
-	    $remotepaths[$i] =  $tmpd. "/". $tmpf;
-	}
-	else
-	{	
-	    # hardcoded
-	    $remotepaths[$i] =~ s/V(1)/zV7/;
-	    $remotepaths[$i] =~ s/V(2)/zV8/;
-	    $remotepaths[$i] =~ s/V(3)/zV6/;
-	    $remotepaths[$i] =~ s/V(4)/zV7/;
-	    $remotepaths[$i] =~ s/V(5)/zV7/;
-	}
-
-	if(-e $remotepaths[$i])
-	{
-	    log::error("Remote file $remotefile[$i] already exists");
-	    db::change_status($dbids[$i], 1);
-	}
-	else
-	{
-	    if( -e $localpaths[$i] )
-	    {
-		fileops::checkdir($remotepaths[$i]);
-		# set $size_orig
-		$size_orig = -s "$localpaths[$i]";
-		
-		log::jpegs("transferring $localpaths[$i] -> $remotepaths[$i]");
-		if( system("cp '$localpaths[$i]' '$remotepaths[$i]'") == 0 )
-		{
-			log::jpegs("saved $localpaths[$i] -> $remotepaths[$i] [size_orig=$size_orig]");
-			# update database
-			db::change_status($dbids[$i], 1);
-			db::write_size_orig($dbids[$i], $size_orig);
-		
-		#	
-		#	WE SHOULD NOT FILL ux_rpath FIELD FOR jpeg-types
-		#
-		#	db::write_ux_rpath($dbids[$i], "$remotepaths[$i]");
-
-			$okay++;
-			
-		}
-		else
-		{
-		    # error in the copy process
-		    log::jpegs("error in copy process (see error log)");
-		    log::error("error in copy process: $?");
-		}
-	    }
-	    else
-	    {
-		# error, local file doesn't exists
-		log::error("Can not open local file $localpaths[$i]");
-		log::jpegs("Can not open local file $localpaths[$i]");
-	    }
-	}
-	
-	# next iteration of 'while' and increment of $i
-	$i++;
-    }
-    
-    log::main("Saved $okay jpegs on remote host");
-    log::jpegs("<<  End transfer process  >>");
-}
-
-
-
 sub probas()
 {
     my @dbids;
@@ -386,8 +286,8 @@
 	}
 	else
 	{	
-	    # /V5/probas/* goes on /zV7/probas/
-	    substr($remotepaths[$i], 1, 2, 'zV7');
+	    # /mnt/maket/proba/* goes on /mnt/rmt_maket/proba/
+	    substr($remotepaths[$i], 1, 2, 'mnt/rmt_maket');
 	}
 	
 	if(-e $remotepaths[$i] || -e $remotepaths[$i] . '.rar')
@@ -501,102 +401,5 @@
     log::main("Saved $okay probas on remote host");
     log::probas("<<  End transfer process  >>");
 }
-
-sub tpps()
-{
-    my @dbids;
-    my @localpaths;
-    my @remotepaths;
-    my $dbids_ref;
-    my $localpaths_ref;
-    my $i = 0;
-    my $okay = 0;
-    
-    my $size_orig;
-    
-    ($dbids_ref, $localpaths_ref) = fetch::tpps_list();
-
-    @dbids = @$dbids_ref;
-    @localpaths = @$localpaths_ref;
-    log::main("Fetched " . scalar(@localpaths) . " tpps from database");
-    log::tpps("<<  Starting transfer process  >>");
-    
-    @remotepaths = @localpaths;	 # clone
-
-    while($localpaths[$i])
-    {
-	# lookup in table first
-	chomp( $tmpf = `basename $remotepaths[$i]` );
-	chomp( $_ = `dirname $remotepaths[$i]` );
-	$tmpd = hash::lookup($_);
-	if ( $tmpd ne '' )
-	{
-	    $remotepaths[$i] =  $tmpd. "/". $tmpf;
-	}
-	else
-	{	
-	    # hardcoded
-	    $remotepaths[$i] =~ s/V(1)/zV7/;
-	    $remotepaths[$i] =~ s/V(2)/zV8/;
-	    $remotepaths[$i] =~ s/V(3)/zV6/;
-	    $remotepaths[$i] =~ s/V(4)/zV7/;
-	    $remotepaths[$i] =~ s/V(5)/zV7/;
-	}
-
-	if(-e $remotepaths[$i])
-	{
-	    log::error("Remote file $remotefile[$i] already exists");
-	    db::change_status($dbids[$i], 1);
-	}
-	else
-	{
-	    if( -e $localpaths[$i] )
-	    {
-		fileops::checkdir($remotepaths[$i]);
-		# set $size_orig
-		$size_orig = -s "$localpaths[$i]";
-		
-		log::tpps("transferring $localpaths[$i] -> $remotepaths[$i]");
-		if( system("cp '$localpaths[$i]' '$remotepaths[$i]'") == 0 )
-		{
-			log::tpps("saved $localpaths[$i] -> $remotepaths[$i] [size_orig=$size_orig]");
-			# update database
-			db::change_status($dbids[$i], 1);
-			db::write_size_orig($dbids[$i], $size_orig);
-		
-		#	
-		#	WE SHOULD NOT FILL ux_rpath FIELD FOR tpp-types
-		#	
-		#	XXX Please explain me why?
-		#
-		#	db::write_ux_rpath($dbids[$i], "$remotepaths[$i]");
-
-			$okay++;
-			
-		}
-		else
-		{
-		    # error in the copy process
-		    log::tpps("error in copy process (see error log)");
-		    log::error("error in copy process: $?");
-		}
-	    }
-	    else
-	    {
-		# error, local file doesn't exists
-		log::error("Can not open local file $localpaths[$i]");
-		log::tpps("Can not open local file $localpaths[$i]");
-	    }
-	}
-	
-	# next iteration of 'while' and increment of $i
-	$i++;
-    }
-    
-    log::main("Saved $okay tpps on remote host");
-    log::tpps("<<  End transfer process  >>");
-}
-
-
 
 return(1);