Changeset 27656 for other-projects

Timestamp:

2013-06-18T19:35:29+12:00 (11 years ago)

Author:

ak19

Message:

Fix for files not getting copied over into the upload_dir on the 32 bit VM

File:

• other-projects/nightly-tasks/diffcol/trunk/task.pl (modified) (3 diffs)

other-projects/nightly-tasks/diffcol/trunk/task.pl

@@ -37 +37 @@
 # or, if one should be checked out, which revision to checkout from svn
 $ENV{'SVN_OPT_REV'} = "-r head";
-#export GSDLHOME=
-#export GSDL3SRCHOME=
+#$ENV{'GSDLHOME'}=
+#$ENV{'GSDL3SRCHOME'}=
 
 
@@ -504 +504 @@
     # ensure the upload directory exists before trying to transfer the xml and html files across
     # if it already existed, clear it of contents
-    if (!-d $ENV{'UPLOAD_DIR'}) {
+    if (! -d $ENV{'UPLOAD_DIR'}) {
     &File::Path::make_path($ENV{'UPLOAD_DIR'});
     } # else rm $UPLOAD_DIR/*    
@@ -512 +512 @@
     for my $entry (readdir $dh) {
     next if ($entry !~ m/(\.xml|\.html)$/);
+    # get the absolute path to the files before copying them over
+    $entry = &filename_concat($ENV{'DATA_DIR'}, $entry);
     copy($entry, $ENV{'UPLOAD_DIR'});
     }