Changeset 18397 for gli/trunk/src/org/greenstone/gatherer/gui/ReplaceSrcDocWithHtmlPrompt.java

Timestamp:

2009-01-15T18:51:49+13:00 (15 years ago)

Author:

ak19

Message:

Changed to work with the tail filename (of the replacement file) returned by script replace_srcdoc_with_html.pl. The file by this new name is now downloaded.

File:

• gli/trunk/src/org/greenstone/gatherer/gui/ReplaceSrcDocWithHtmlPrompt.java (modified) (6 diffs)

gli/trunk/src/org/greenstone/gatherer/gui/ReplaceSrcDocWithHtmlPrompt.java

@@ -81 +81 @@
     /** whether we were successful or not */
     private boolean successful;
-
+    /** The command output of a successful execution of the replace script 
+     * containing the generated tailname of the replacement file */ 
+    private String successfulOutput;
 
     public ReplaceSrcDocWithHtmlPrompt(File[] source_files) {
@@ -180 +182 @@
     if(event.getStatus() == GShell.OK) {
         successful = true;
+        GShell process = (GShell)event.getSource();
+        successfulOutput = process.getCommandOutput();
+        process.resetCommandOutput();
     }
     }
@@ -292 +297 @@
         return 0;
     } 
-    return -1;
+    return 1;
     }   
 
@@ -354 +359 @@
         // first run the replace process for all src files, and accumulate error exit values (0 means it's fine)
         for(int i = 0; i < srcdoc_files.length; i++) {
-        int exit_value_this_time =  replaceSrcDoc(i);
+        int exit_value_this_time = replaceSrcDoc(i);
         exit_value += exit_value_this_time; // if all files successfully replaced, exit_value will stay at 0
 
@@ -366 +371 @@
         } else {
             if (Gatherer.isGsdlRemote) {
+            //System.err.println("*****ReplaceSrcDocWithHtmlPrompt.java - run() - gsdl remote case");
+
+            // Conversion may have renamed the file by URL- or base64-encoding it.
+            // The new replacement file's tailname is the last line of the script output.
+            String[] lines = successfulOutput.split("\n");
+            String suffixlessFilename = lines[lines.length-1];
+            String htmlFile = suffixlessFilename+".html";
+
             // Delete the local copy of the old source document file on the client side 
             // (it's already been replaced on the server side), and download the updated 
             // (html) file and any directory containing associated files
-            System.err.println("*****ReplaceSrcDocWithHtmlPrompt.java - run() - gsdl remote case");
-            // not sure what the new file is renamed to, so at present still delete entire
-            // containing directory and get the updated copy of this directory from remote server
             Utility.delete(srcdoc_files[i]); // remove the local copy of src doc
-
-            // let's get just the filename without the suffix
-            String htmlFile = srcdoc_files[i].getName();
-            int lastperiod = htmlFile.lastIndexOf('.');
-            String suffixlessFilename = htmlFile.substring(0, lastperiod); // cut off suffix
-            htmlFile = suffixlessFilename+".html"; // html filename
 
             // download the generated html file from the server side to put it 
@@ -390 +394 @@
             // If an associated_folder by such a name exists, download it
             if(Gatherer.remoteGreenstoneServer.exists(CollectionManager.getLoadedCollectionName(), assoc_folder)) {
-              Gatherer.remoteGreenstoneServer.downloadCollectionFile(
+                Gatherer.remoteGreenstoneServer.downloadCollectionFile(
                                     CollectionManager.getLoadedCollectionName(), assoc_folder);
             }