Changeset 22454 for main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

Timestamp:

2010-07-20T17:01:04+12:00 (14 years ago)

Author:

ak19

Message:

3rd commit to do with getting Remote GLI to work with colgroups: changes to GLI code to adjust for instances where the collection group and tail names need to be carefully used to get the zip file path and zip file name right.

File:

• main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -1206 +1206 @@
     File collection_file = new File(location);
 
+    //String collection_name = collection_directory.getName();
+    String collection_name = "";        
     File collection_directory = collection_file.getParentFile();
-    String collection_name = collection_directory.getName();
+
+    // To get colname = (colgroup/)coltailname, subtract Gatherer.getCollectDirectoryPath() from collection_directory:
+    int index = collection_directory.getAbsolutePath().indexOf(Gatherer.getCollectDirectoryPath()); 
+    if(index == -1) {
+        System.err.println("*** ERROR: collection directory " + collection_directory + " is not located in collect folder: " + Gatherer.getCollectDirectoryPath());
+    } else {
+        index += Gatherer.getCollectDirectoryPath().length();       
+        collection_name = collection_directory.getAbsolutePath().substring(index);
+    }
 
     if (Gatherer.isGsdlRemote) {