Changeset 18354 for gli/branches/rtl-gli/src/org/greenstone/gatherer/file/FileManager.java

Timestamp:

2009-01-12T11:17:50+13:00 (15 years ago)

Author:

kjdon

Message:

updated the rtl-gli branch with files from trunk. Result of a merge 14807:18318

File:

• gli/branches/rtl-gli/src/org/greenstone/gatherer/file/FileManager.java (modified) (11 diffs)

gli/branches/rtl-gli/src/org/greenstone/gatherer/file/FileManager.java

@@ -45 +45 @@
 import org.greenstone.gatherer.collection.CollectionTreeNode;
 import org.greenstone.gatherer.gui.ExplodeMetadataDatabasePrompt;
+import org.greenstone.gatherer.gui.ReplaceSrcDocWithHtmlPrompt; 
 import org.greenstone.gatherer.gui.GProgressBar;
 import org.greenstone.gatherer.gui.NewFolderOrFilePrompt;
@@ -179 +180 @@
                 source_files[i] = source_nodes[i].getFile();
             }
-            RemoteGreenstoneServer.uploadFilesIntoCollection(collection_name, source_files, target_node.getFile());
+            Gatherer.remoteGreenstoneServer.uploadFilesIntoCollection(collection_name, source_files, target_node.getFile());
             }
             else if (type == FileJob.DELETE) {
             // Deletes: delete each top-level file/directory one at a time
             for (int i = 0; i < source_nodes.length; i++) {
-                RemoteGreenstoneServer.deleteCollectionFile(collection_name, source_nodes[i].getFile());
+                Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection_name, source_nodes[i].getFile());
             }
             }
@@ -190 +191 @@
             // Moves: move each top-level file/directory one at a time
             for (int i = 0; i < source_nodes.length; i++) {
-                RemoteGreenstoneServer.moveCollectionFile(collection_name, source_nodes[i].getFile(), target_node.getFile());
+                Gatherer.remoteGreenstoneServer.moveCollectionFile(
+                                     collection_name, source_nodes[i].getFile(), target_node.getFile());
             }
             }
@@ -201 +203 @@
     }
 
-
     public void explodeMetadataDatabase(File file)
     {
@@ -208 +209 @@
     }
 
+    // Works with replace_srcdoc_with_html.pl
+    public void replaceSrcDocWithHtml(File[] files)
+    {
+    // This must go in a separate thread because we need the progress bar to work (remote Greenstone server)
+    new ReplaceSrcDocWithHtmlPromptTask(files).start();
+    }
 
     private class ExplodeMetadataDatabasePromptTask
@@ -222 +229 @@
     {
         ExplodeMetadataDatabasePrompt emp = new ExplodeMetadataDatabasePrompt(metadata_database_file);
+    }
+    }
+
+    // Works with replace_srcdoc_with_html.pl
+    private class ReplaceSrcDocWithHtmlPromptTask
+    extends Thread
+    {
+    private File[] replace_these_srcdoc_files = null;
+
+    public ReplaceSrcDocWithHtmlPromptTask(File[] replace_these_srcdoc_files)
+    {
+        this.replace_these_srcdoc_files = replace_these_srcdoc_files;
+    }
+
+    public void run()
+    {
+        ReplaceSrcDocWithHtmlPrompt prompt = new ReplaceSrcDocWithHtmlPrompt(replace_these_srcdoc_files);
     }
     }
@@ -249 +273 @@
         // ... but only if it is inside the collection and we haven't already downloaded it
         if (file.getAbsolutePath().startsWith(Gatherer.getCollectDirectoryPath()) && file.length() == 0) {
-            if (RemoteGreenstoneServer.downloadCollectionFile(CollectionManager.getLoadedCollectionName(), file).equals("")) {
+            if (Gatherer.remoteGreenstoneServer.downloadCollectionFile(
+                                 CollectionManager.getLoadedCollectionName(), file).equals("")) {
             // Something has gone wrong downloading the file
             return;
@@ -324 +349 @@
                 folder_file.createNewFile();
                 if (Gatherer.isGsdlRemote) {
-                RemoteGreenstoneServer.uploadCollectionFile(CollectionManager.getLoadedCollectionName(), folder_file);
+                Gatherer.remoteGreenstoneServer.uploadCollectionFile(
+                                         CollectionManager.getLoadedCollectionName(), folder_file);
                 }
             }
@@ -330 +356 @@
                 folder_file.mkdirs();
                 if (Gatherer.isGsdlRemote) {
-                RemoteGreenstoneServer.newCollectionDirectory(CollectionManager.getLoadedCollectionName(), folder_file);
+                Gatherer.remoteGreenstoneServer.newCollectionDirectory(
+                                         CollectionManager.getLoadedCollectionName(), folder_file);
                 }
             }
@@ -390 +417 @@
         file_queue.addJob(System.currentTimeMillis(), collection_tree, new FileNode[] { collection_tree_node }, collection_tree, new_collection_tree_node, FileJob.RENAME);
         if (Gatherer.isGsdlRemote) {
-            RemoteGreenstoneServer.moveCollectionFile(CollectionManager.getLoadedCollectionName(), collection_file, new_collection_file);
+            Gatherer.remoteGreenstoneServer.moveCollectionFile(
+                             CollectionManager.getLoadedCollectionName(), collection_file, new_collection_file);
         }
         }
@@ -439 +467 @@
         file_queue.addJob(System.currentTimeMillis(), Gatherer.g_man.gather_pane.workspace_tree, new FileNode[] { source_node }, collection_tree, (FileNode)collection_tree_node.getParent(),  FileJob.COPY_FILE_ONLY);
         if (Gatherer.isGsdlRemote) {
-        RemoteGreenstoneServer.uploadFilesIntoCollection(CollectionManager.getLoadedCollectionName(), new File[] { new_file }, target_directory);
+        Gatherer.remoteGreenstoneServer.uploadFilesIntoCollection(
+                         CollectionManager.getLoadedCollectionName(), new File[] { new_file }, target_directory);
         }
         // do a replace of old file with new file