Changeset 19668 for gli/branches/glicolgroup/src/org/greenstone/gatherer/collection/CollectionManager.java

Timestamp:

2009-05-29T12:37:08+12:00 (15 years ago)

Author:

ak19

Message:

Not working. Changes made for collectiongroup.

File:

• gli/branches/glicolgroup/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (7 diffs)

gli/branches/glicolgroup/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -398 +398 @@
     // Remove the lock file on the server
     if (Gatherer.isGsdlRemote) {
-        Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection.getName(), lock_file);
+        Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection.getGroupQualifiedName(true), lock_file);
     }
 
@@ -572 +572 @@
 
         // for remote case, scheduling causes an Exception on creating a new collection that 
-        // can't be recovered from. For GS3, it doesn't work since it it trying to access etc/main.cfg
+        // can't be recovered from. For GS3, it doesn't work since it is trying to access etc/main.cfg
         if (canDoScheduling()) {
         scheduling();
@@ -583 +583 @@
         // Import default metadata sets, if any
         // for (int i = 0; metadata_sets != null && i < metadata_sets.size(); i++) {
-        // importMetadataSet((MetadataSet) metadata_sets.get(i));
+        // importMetadataSet((MetadataSecollection_namet) metadata_sets.get(i));
         // }
 
@@ -1106 +1106 @@
         // If we're using a remote Greenstone server, upload the metadata file
         if (Gatherer.isGsdlRemote) {
-            Gatherer.remoteGreenstoneServer.uploadCollectionFile(collection.getName(), metadata_set_file);
+            Gatherer.remoteGreenstoneServer.uploadCollectionFile(collection.getGroupQualifiedName(true), metadata_set_file);
         }
         }
@@ -1169 +1169 @@
     {
     DebugStream.println("Loading collection " + location + "...");
+    System.err.println("*** Loading collection " + location + "...");
 
     if (Gatherer.isGsdlRemote) {
-        String collection_name = location.substring(location.lastIndexOf(File.separator) + 1, location.length() - ".col".length());
+        //String collection_name = location.substring(location.lastIndexOf(File.separator) + 1, location.length() - ".col".length());
+        String collection_name = location.substring(0, location.lastIndexOf(File.separator));
+        collection_name = Gatherer.remoteGreenstoneServer.getPathRelativeToDirectory(new File(collection_name), getDefaultCollectDirectory());
         if (Gatherer.remoteGreenstoneServer.downloadCollection(collection_name).equals("")) {
         return;
@@ -1670 +1673 @@
         // If we're using a remote Greenstone server, delete the metadata file on the server
         if (Gatherer.isGsdlRemote) {
-        Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection.getName(), metadata_set_file);
+        Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection.getGroupQualifiedName(true), metadata_set_file);
         }
     }
@@ -1806 +1809 @@
         if (Gatherer.isGsdlRemote) {
             Gatherer.remoteGreenstoneServer.deleteCollectionFile(
-                             collection.getName(), new File(getLoadedCollectionIndexDirectoryPath()));
-            Gatherer.remoteGreenstoneServer.moveCollectionFile(collection.getName(), 
+                             collection.getGroupQualifiedName(true), new File(getLoadedCollectionIndexDirectoryPath()));
+            Gatherer.remoteGreenstoneServer.moveCollectionFile(collection.getGroupQualifiedName(true), 
                     new File(getLoadedCollectionBuildingDirectoryPath()), new File(getLoadedCollectionIndexDirectoryPath()));
         }