Changeset 13464

Timestamp:

2006-12-08T12:10:46+13:00 (17 years ago)

Author:

mdewsnip

Message:

More progress on getting the exploding working with remote building.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/ExplodeMetadataDatabasePrompt.java (modified) (3 diffs)
• remote/RemoteGreenstoneServer.java (modified) (1 diff)

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

@@ -45 +45 @@
 import org.greenstone.gatherer.cdm.CollectionDesignManager;
 import org.greenstone.gatherer.cdm.Plugin;
+import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.collection.ScriptOptions;
 import org.greenstone.gatherer.gui.tree.DragTree;
@@ -52 +53 @@
 import org.greenstone.gatherer.metadata.MetadataSetManager;
 import org.greenstone.gatherer.metadata.MetadataTools;
+import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
 import org.greenstone.gatherer.shell.GShell;
 import org.greenstone.gatherer.shell.GShellEvent;
@@ -261 +263 @@
     }
 
-    // Add in the filename
-    command_parts_list.add(metadata_file.getPath());
+    // Local case
+    if (!Gatherer.isGsdlRemote) {
+        // Add in the filename
+        command_parts_list.add(metadata_file.getPath());
+    }
+    // Remote case
+    else {
+        // Add in the filename, relative to the collection directory
+        String collection_name = Gatherer.c_man.getCollection().getName();
+        String collection_directory_path = CollectionManager.getCollectionDirectoryPath(collection_name);
+        String metadata_file_relative_path = RemoteGreenstoneServer.getPathRelativeToDirectory(metadata_file, collection_directory_path);
+        command_parts_list.add("-file");
+        command_parts_list.add(metadata_file_relative_path);
+
+        // When running remotely we also need the collection name as the last argument
+        command_parts_list.add(collection_name);
+    }
 
     // Run the explode_metadata_database.pl command

trunk/gli/src/org/greenstone/gatherer/remote/RemoteGreenstoneServer.java

@@ -1135 +1135 @@
 
 
-    static private String getPathRelativeToDirectory(File file, String directory_path)
+    static public String getPathRelativeToDirectory(File file, String directory_path)
     {
     String file_path = file.getAbsolutePath();