[Koha-cvs] CVS: koha/misc/translator tmpl_process3.pl,1.20.2.3,1.20.2.4

[Paul POULAIN]

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28476/misc/translator

Modified Files:
      Tag: rel_2_2
	tmpl_process3.pl 
Log Message:
bugfix for new behaviour (copying non-template files during install) still ignore those files during .po creation or update (.po are not friends with binary files ;-) )

Index: tmpl_process3.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v
retrieving revision 1.20.2.3
retrieving revision 1.20.2.4
diff -C2 -r1.20.2.3 -r1.20.2.4
*** tmpl_process3.pl	30 Mar 2005 12:28:47 -0000	1.20.2.3
--- tmpl_process3.pl	31 Mar 2005 08:04:34 -0000	1.20.2.4
***************
*** 114,119 ****
  }
  
! sub listfiles ($$) {
!     my($dir, $type) = @_;
      my @it = ();
      if (opendir(DIR, $dir)) {
--- 114,119 ----
  }
  
! sub listfiles ($$$) {
!     my($dir, $type, $action) = @_;
      my @it = ();
      if (opendir(DIR, $dir)) {
***************
*** 126,132 ****
  		;
  	    } elsif (-f $path) {
! 		push @it, $path ;#if !defined $type || $dirent =~ /\.(?:$type)$/;
  	    } elsif (-d $path && $recursive_p) {
! 		push @it, listfiles($path, $type);
  	    }
  	}
--- 126,132 ----
  		;
  	    } elsif (-f $path) {
! 		push @it, $path if (!defined $type || $dirent =~ /\.(?:$type)$/) || $action eq 'install';
  	    } elsif (-d $path && $recursive_p) {
! 		push @it, listfiles($path, $type, $action);
  	    }
  	}
***************
*** 177,184 ****
  
  The -o option is ignored for the "create" and "update" actions.
! Try `perldoc $0' for perhaps more information.
  EOF
      exit($exitcode);
! }
  
  ###############################################################################
--- 177,184 ----
  
  The -o option is ignored for the "create" and "update" actions.
! Try `perldoc $0 for perhaps more information.
  EOF
      exit($exitcode);
! }#`
  
  ###############################################################################
***************
*** 188,192 ****
  	print STDERR "$msg\n";
      }
!     print STDERR "Try `$0 --help' for more information.\n";
      exit(-1);
  }
--- 188,192 ----
  	print STDERR "$msg\n";
      }
!     print STDERR "Try `$0 --help for more information.\n";
      exit(-1);
  }
***************
*** 239,243 ****
      $in_dir = $in_files[0];
      $in_dir =~ s/\/$//; # strips the trailing / if any
!     @in_files = listfiles($in_dir, $type);
  } else {
      for my $input (@in_files) {
--- 239,243 ----
      $in_dir = $in_files[0];
      $in_dir =~ s/\/$//; # strips the trailing / if any
!     @in_files = listfiles($in_dir, $type, $action);
  } else {
      for my $input (@in_files) {