Changeset 15153 for gsdl/trunk/bin/script/replace_srcdoc_with_html.pl

Timestamp:

2008-03-29T18:03:46+13:00 (16 years ago)

Author:

ak19

Message:

Moved code that checks for name collisions between generated html (and any assoc_folder) in tmp folder with existing files/folders in import folder before trying to move

File:

• gsdl/trunk/bin/script/replace_srcdoc_with_html.pl (modified) (4 diffs)

gsdl/trunk/bin/script/replace_srcdoc_with_html.pl

@@ -58 +58 @@
     my $hashParsingResult = {};
 
+ 
     # parse the options
     my $intArgLeftinAfterParsing = parse2::parse(\@ARGV,$arguments,$hashParsingResult,"allow_extra_options");
@@ -99 +100 @@
     
     &PrintUsage::print_txt_usage($options, "{srcreplace.params}");
-    print STDERR "You need to specify a filename";
+    print STDERR "You need to specify a filename\n";
     die "\n";
     }
@@ -140 +141 @@
     # or windows_scripting did the conversion of the Word doc to html.
     my $output_filename = $plugobj->tmp_area_convert_file("html", $filename);    
-    # my $output_filename = $plugobj->tmp_area_convert_file($output_ext, $input_filename, $textref);
-    
-    if(!defined $output_filename || (!-e $output_filename)) { # if no output html file was created, then error message
+
+
+    # if something went wrong, then tmp_area_convert_file returns "", but can also check
+    # for whether the output file exists or not
+    if(!-e $output_filename || $output_filename eq "") { 
+    # if no output html file was created, then die so that GLI displays error message
     print STDERR "***replace_srcdoc_with_html.pl: no output file created for $filename ***\n";
     die "No html file created for $filename. Replacement did not take place\n"; # Program NEEDS to die here, 
@@ -155 +159 @@
     my ($tmp_name, $tmp_dir, $ext) = &File::Basename::fileparse($output_filename, "\\.[^\\.]+\$");
 
-    if($import_dir ne $tmp_dir) { # output file is not in the same folder
-    my $assoc_folder = &util::filename_cat($tmp_dir, $tmp_name."_files");
-    
-    # use util to move it all to the import directory where the original file is located
-    #&util::mv($output_filename, &util::filename_cat($import_dir, $tmp_name.$ext)); # doesn't work
-    #&util::mv($output_filename, $import_dir); # doesn't work
-    &util::cp($output_filename, $import_dir);
+    # the name of the folder of associated files (which may or may not exist) in the tmp dir
+    my $assoc_folder = &util::filename_cat($tmp_dir, $tmp_name."_files");
+ 
+    # Need to check for naming collisions: in case there is already a file or folder 
+    # in the import directory by the name of those we want to move there from the tmp folder
+    # First need to work out the full paths to any assoc folder if it were copied into the 
+    # import directory, and the main html file if it were copied into the import folder:
+    my $new_assoc_folder = &util::filename_cat($import_dir,  $tmp_name."_files"); 
+    my $new_file = &util::filename_cat($import_dir,  $tmp_name.$ext); 
+
+    # If there is an image folder, any naming collisions now would mean that the links of 
+    # the html file to the image folder would break if we changed the assoc_folder's name. 
+    # Therefore, in such a case this process dies after deleting both the file and assoc_folder.
+    if(-e $assoc_folder && -e $new_assoc_folder) {
+    # so an associated folder was generated, AND a folder by that name already exists
+    # in the import folder where we want to copy the generated folder to.
     &util::rm($output_filename);
-    if(defined $assoc_folder) { # move any associated folders too
-        print STDERR "****Folder for associated files is $assoc_folder\n";
-        #&util::mv($assoc_folder, $import_dir); # doesn't work for me
-        &util::cp_r($assoc_folder, $import_dir);
-        &util::rm_r($assoc_folder);
-    }
-    } # else output file was created in the same folder as the input file 
-    # this happens for txt files processed by TEXTPlug
-    # in this case, there will be no image folder AND no moving of output html file is necessary
+    &util::rm_r($assoc_folder); # we know directory exists, so remove dir
+    die "Image folder $new_assoc_folder already exists.\nDeleting generated file and folder, else links to images will break.\n";
+    } 
+    # Finally, check that no file already exists with the same name as the generated stand-alone
+    # file. Have to do this *after* checking for name collisions with any assoc_folder, because
+    # that also tries to remove any output files.
+    if(-e $new_file) { # a file by that name already exists, delete the generated file
+    &util::rm($output_filename);
+    die "File $new_file already exists. Deleting generated file.\n";
+    }
+   
+    # Now we know we have no file name collisions
+    # use util to move it all to the import directory where the original file is located
+    #&util::mv($output_filename, &util::filename_cat($import_dir, $tmp_name.$ext)); # doesn't work
+    #&util::mv($output_filename, $import_dir); # doesn't work
+    &util::cp($output_filename, $import_dir);
+    &util::rm($output_filename);
+    if(-e $assoc_folder) { # move any associated folders too
+    #print STDERR "****Folder for associated files is $assoc_folder\n";
+    #&util::mv($assoc_folder, $import_dir); # doesn't work for me
+    &util::cp_r($assoc_folder, $import_dir);
+    &util::rm_r($assoc_folder);
+    }
 
     # Now we can remove the source doc permanently (there are no assocdirs for source doc)