Changeset 19203

Timestamp:

2009-04-22T17:39:05+12:00 (15 years ago)

Author:

ak19

Message:

Undoing the changes where the Collection.getName() always returned the groupQualifiedName(). Now it returns the collection's subname again.

Location:

gli/trunk/src/org/greenstone/gatherer

Files:

• collection/Collection.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (1 diff)
• greenstone/LocalLibraryServer.java (modified) (1 diff)
• gui/PreviewButton.java (modified) (1 diff)

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

@@ -181 +181 @@
      */
     public String getName() {
-    return getGroupQualifiedName(true);
+    return getCollectionSubName();
+    //return getGroupQualifiedName(true);
     }
 

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

gli/trunk/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java

@@ -175 +175 @@
         File localLinuxServerFolder = new File(gsdl_path, "apache-httpd");
         if (!localLinuxServerFolder.exists() && !localLinuxServerFolder.isDirectory()) {
-        System.err.println("The web server does not exist at " 
-                   + localLinuxServerFolder.getAbsolutePath() + "\nNo local library at all. Trying web library");
         DebugStream.println("The web server does not exist at " 
                     + localLinuxServerFolder.getAbsolutePath() + "\nNo local library at all. Trying web library");

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.getLoadedCollectionName();
+    String collGroupWithName = CollectionManager.getLoadedGroupQualifiedCollectionName(true);
 
     // set up the home page for the current collection