Changeset 19862

Timestamp:

2009-06-18T15:09:49+12:00 (15 years ago)

Author:

ak19

Message:

Getting the preview button working again for GS3.

Location:

gli/trunk/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (5 diffs)
• gui/PreviewButton.java (modified) (1 diff)

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

@@ -371 +371 @@
         // It is not necessary if an independent GSI was launched and the user hasn't pressed Enter Library yet
         DebugStream.println("Configuration.library_url = " + Configuration.library_url);
-        if (Configuration.library_url == null && (isLocalLibrary && !LocalLibraryServer.isURLPending())) {
-        missingEXEC(); 
+        if (Configuration.library_url == null) {
+        if(isLocalLibrary) {
+            if(!LocalLibraryServer.isURLPending()) {
+            missingEXEC();
+            }
+            // else LocalLibraryServer is expecting a URL soon, so don't need to display the dialog
+        } else { // GS2 webLibrary or GS3 or remote Greenstone
+            missingEXEC();
+        }
         }
 
@@ -772 +779 @@
     static public void configGS3Server(String site, String command) {
     if (Configuration.library_url == null){
-        System.out.println("Error: you have not provide the Greenstone Library address.");  
+        System.out.println("Error: you have not provided the Greenstone Library address.");  
            return;
 
@@ -863 +870 @@
     /** Prints a warning message about a missing library path, which means the final collection cannot be previewed in the Gatherer.
      */
-    static private void missingEXEC() {
+    static public void missingEXEC() {
     WarningDialog dialog;
     String configPropertyName = "general.library_url"+Configuration.gliPropertyNameSuffix();
@@ -888 +895 @@
             props.load(new FileInputStream(buildPropsFile));
             host = props.getProperty("tomcat.server", host); 
-            port = props.getProperty("tomcat.port", port); 
+            port = props.getProperty("tomcat.port", port);
         }catch(Exception e){
             DebugStream.println("Could not load build.properties file");
@@ -895 +902 @@
         props = null;
         }
-        String defaultURL = "http://"+host+":"+port+"/"+"greenstone3/library";
+        String defaultURL = "http://"+host+":"+port+"/"+"greenstone3";
         field.setText(defaultURL);
         field.selectAll();

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

@@ -82 +82 @@
     // 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=" + collGroupWithName + "&l=" + Configuration.getLanguage();
+        if(Configuration.library_url == null) {
+        Gatherer.missingEXEC();
+        } else {
+        // don't do anything fancy here
+        preview_address = Configuration.library_url.toString() + Configuration.getServletPath() 
+            + "?a=p&sa=about&c=" + collGroupWithName + "&l=" + Configuration.getLanguage();
+        }
         return;
     }