Changeset 19041 for gli/trunk/src/org/greenstone/gatherer/gui/PreviewButton.java

Timestamp:

2009-04-17T19:44:48+12:00 (15 years ago)

Author:

ak19

Message:

The PreviewButton's response had not been updated to load the page of a collection if this was nested in a collectiongroup. Adjusted relevant classes to make the PreviewButton work in the collection group case as well.

File:

• gli/trunk/src/org/greenstone/gatherer/gui/PreviewButton.java (modified) (2 diffs)

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

@@ -74 +74 @@
     }
     protected void configureHomeURL() {
+    // we could be working with standalone collections or collection groups
+    // so getting a collection-name may have a collection group prefix
+    // This means CollectionManager.getLoadedCollectionName() is no longer sufficient
+    String collGroupWithName = CollectionManager.getLoadedColNameWithGroup(true); 
+
     // set up the home page for the current collection
     if (Gatherer.GS3 && !Configuration.fedora_info.isActive()) { // GLI for GS3 case
         // don't do anything fancy here
-        preview_address = Configuration.library_url.toString() + Configuration.getServletPath() + "?a=p&sa=about&c=" + CollectionManager.getLoadedCollectionName() + "&l=" + Configuration.getLanguage();
+        preview_address = Configuration.library_url.toString() + Configuration.getServletPath() 
+        + "?a=p&sa=about&c=" + collGroupWithName + "&l=" + Configuration.getLanguage();
         return;
     }
@@ -86 +92 @@
     
     // FLI or GLI for GS2 case (no library_url)
-    preview_address = Configuration.library_url.toString() + "?c=" + CollectionManager.getLoadedCollectionName() + "&l=" + Configuration.getLanguage();
+    preview_address = Configuration.library_url.toString() + "?c=" + collGroupWithName + "&l=" + Configuration.getLanguage();
 
     String main_args = "&a=p&p=about";