Changeset 15167 for gsdl/trunk

Timestamp:

2008-04-02T18:15:29+13:00 (16 years ago)

Author:

ak19

Message:

Modified tmp_area_convert_file routine to use pass new argument ensure_path_absolute to util::soft_link to make sure soft-linking works for GSDL remote case

File:

• gsdl/trunk/perllib/plugins/TEXTPlug.pm (modified) (3 diffs)

gsdl/trunk/perllib/plugins/TEXTPlug.pm

@@ -150 +150 @@
     = &File::Basename::fileparse($input_filename, "\\.[^\\.]+\$");
 
-    # softlink to collection tmp dir
+    # Softlink to collection tmp dir
+    # First find a temporary directory to create the output file in
     my $tmp_dirname = $dirname;
     if(defined $ENV{'GSDLCOLLECTDIR'}) {
@@ -160 +161 @@
     &util::mk_dir($tmp_dirname) if (!-e $tmp_dirname);
 
-
     # convert to utf-8 otherwise we have problems with the doc.xml file
     # later on
     &unicode::ensure_utf8(\$tailname); # TODO: does this change the filename or not?
              # need to test this out on a windows computer using a Greek filename
-
+    $suffix = lc($suffix);
     my $tmp_filename = &util::filename_cat($tmp_dirname, "$tailname$suffix"); 
-    &util::soft_link($input_filename, $tmp_filename);
-    # softlink symbolic link to or copy of original, so we don't accidentally damage it
-
-    #my $output_filename = $tailname$output_ext;#output_ext has to be html!
+    
+    # Make sure we have the absolute path to the input file
+    # (If gsdl is remote, we're given relative path to input file, of the form import/tailname.suffix
+    # But we can't softlink to relative paths. Therefore, we need to ensure that
+    # the input_filename is the absolute path.
+    my $ensure_path_absolute = 1; # true
+
+    # Now make the softlink,  so we don't accidentally damage the input file
+    # softlinking creates a symbolic link to (or, if that's not possible, it makes a copy of) the original
+    &util::soft_link($input_filename, $tmp_filename, $ensure_path_absolute);
+     
+    my $verbosity = $self->{'verbosity'};
+    if ($verbosity > 0) {
+    # need this output statement, as GShell.java's runRemote() sets status to CANCELLED
+    # if there is no output! (Therefore, it only had this adverse affect when running GSDL remotely)
+    print $outhandle "Converting $tailname$suffix to html\n";
+    }
+
+    #my $output_filename = $tailname$output_ext; #output_ext has to be html!
     my $output_filename = &util::filename_cat($tmp_dirname, $tailname.".html");
     
-    # read contents of text file line by line into an array
+    # Read contents of text file line by line into an array
     # create an HTML file from the text file
     # Recreate the original file for writing the updated contents
     unless(open(TEXT, "<$tmp_filename")) { # open it as a new file for writing
-    print STDERR "TEXTPlug.pm: Unable to open and read from $input_filename for converting to html...ERROR\n";
+    print STDERR "TEXTPlug.pm: Unable to open and read from $tmp_filename for converting to html...ERROR: $!\n";
     return ""; # no file name
     }
 
+    # Read the entire file at once
     my $text;
     { 
-    local $/ = undef; # Read entire file at once. This is from http://perl.plover.com/local.html
-    $text = <TEXT>;  # Now file is read in as one single 'line'
+    local $/ = undef; # Now can read the entire file at once. From http://perl.plover.com/local.html
+    $text = <TEXT>;   # File is read in as one single 'line'
     }
     close(TEXT); # close the file
@@ -196 +212 @@
     # try creating this new file writing and try opening it for writing, else exit with error value
     unless(open(HTML, ">$output_filename")) {  # open the new html file for writing
-    print STDERR "TEXTPlug.pm: Unable to create $output_filename for writing $tailname$suffix txt converted to html...ERROR\n";
+    print STDERR "TEXTPlug.pm: Unable to create $output_filename for writing $tailname$suffix txt converted to html...ERROR: $!\n";
     return ""; # no filename
     }