Changeset 18364 for gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/PreviewButton.java

Timestamp:

2009-01-12T11:40:15+13:00 (15 years ago)

Author:

kjdon

Message:

updated the rtl-gli branch with files from trunk. Result of a merge 14807:18318, and fixed some conflicts. I think this is the last commit following merging the files. Haven't tried to compile yet... here goes...

File:

• gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/PreviewButton.java (modified) (1 diff)

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/PreviewButton.java

@@ -75 +75 @@
     protected void configureHomeURL() {
     // set up the home page for the current collection
-    if (Gatherer.GS3) {
+    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();
         return;
     }
+    // FLI or GLI for GS2 case (no library_url)
     preview_address = Configuration.library_url.toString() + "?c=" + CollectionManager.getLoadedCollectionName() + "&l=" + Configuration.getLanguage();