Changeset 19197

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

Location:

gli/trunk/src/org/greenstone/gatherer

Files:

• collection/Collection.java (modified) (4 diffs)
• collection/CollectionManager.java (modified) (3 diffs)
• gui/PreviewButton.java (modified) (1 diff)

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();
     }
 

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

@@ -906 +906 @@
 
     /** Returns the name of the loaded collection.
+     *  Returns the "collectionGroupName/collectionName" or just the collectionName 
+     *  depending on whether the collection is part of a collection group or not.
      */
     static public String getLoadedCollectionName()
@@ -911 +913 @@
     if (collection != null) {
         return collection.getName();
+    }
+
+    return null;
+    }
+
+    /** @return the subname of any collection (stripped of any collection-group). */
+    static public String getLoadedCollectionSubName()
+    {
+    if (collection != null) {
+        return collection.getCollectionSubName();
     }
 
@@ -922 +934 @@
      * (\ or /, depending on the OS).
      */
-    static public String getLoadedColNameWithGroup(boolean url)
+    static public String getLoadedGroupQualifiedCollectionName(boolean url)
     {
     if (collection != null) {
-        return collection.getGroupWithName(url);
+        return collection.getGroupQualifiedName(url);
     }
 

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

@@ -77 +77 @@
     // so getting a collection-name may have a collection group prefix
     // This means CollectionManager.getLoadedCollectionName() is no longer sufficient
-    String collGroupWithName = CollectionManager.getLoadedColNameWithGroup(true); 
+    String collGroupWithName = CollectionManager.getLoadedCollectionName();
 
     // set up the home page for the current collection