Changeset 19197 for gli/trunk/src/org/greenstone/gatherer/collection/Collection.java

Timestamp:

2009-04-22T15:52:31+12:00 (15 years ago)

Author:

ak19

Message:

Tentative changes for getting the collectiongroup construct to work with the RemoteGreenstoneServer

File:

• gli/trunk/src/org/greenstone/gatherer/collection/Collection.java (modified) (4 diffs)

gli/trunk/src/org/greenstone/gatherer/collection/Collection.java

@@ -177 +177 @@
     }
 
-    /** Retrieve the short name for this collection.
+    /** Retrieve the short name for this collection. Always qualified by the collectionGroup, if any.
      * @return The name as a <strong>String</strong>.
      */
     public String getName() {
+    return getGroupQualifiedName(true);
+    }
+
+    /** @return just the sub-name of the collection: without any collection group prefix */
+    public String getCollectionSubName() {
     return file.getParentFile().getName();
     }
@@ -186 +191 @@
     /** @return just the name of the collection group if any, else returns "" */
     public String getCollectionGroupName() {
-    String groupAndColName = getGroupWithName(true);
+    String groupAndColName = getGroupQualifiedName(true);
 
     int slash = groupAndColName.indexOf('/');
@@ -204 +209 @@
      * @return collection-group-name/collection-name
      */
-    public String getGroupWithName(boolean url) {
+    public String getGroupQualifiedName(boolean url) {
     // Subtracting collect dir's path from the current collection's path
 
@@ -216 +221 @@
         // shouldn't happen, but in case it does, just return the collection name.
         System.err.println("Current collection " + currentCollDir + " is not located inside collectdir " + "collectDir");
-        groupAndCol = getName();
+        groupAndCol = getCollectionSubName();
     }