Changeset 5929 for trunk

Timestamp:

2003-11-21T10:57:10+13:00 (21 years ago)

Author:

kjdon

Message:

fixed the url generation stuff for preview - wasn't updating changes to search types

File:

• trunk/gli/src/org/greenstone/gatherer/gui/CreatePane.java (modified) (4 diffs)

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

@@ -46 +46 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.cdm.SearchTypeManager;
 import org.greenstone.gatherer.collection.BuildOptions;
 import org.greenstone.gatherer.collection.Collection;
@@ -246 +247 @@
         preview_button.setEnabled(false);
     } else {
-        // set up the home page for the current collection
-        String extra_args = "";
-        String build_type = current_collection.getCollectionType();
-        if (build_type.equals("mgpp")) {
-        // we need some more args on the url
-        String search_types = current_collection.getSearchTypes();
-        if (search_types.equals("")) {
-            extra_args = "&ct=1&qt=0&qto=3";
-        } else if (search_types.equals("plain")) {
-            extra_args = "&ct=1&qt=0&qto=1";
-        } else if (search_types.equals("form")) {
-            extra_args = "&ct=1&qt=1&qto=2";
-        } else if (search_types.equals("plain,form")) {
-            extra_args = "&ct=1&qt=0&qto=3";
-        } else if (search_types.equals("form,plain")) {
-            extra_args = "&ct=1&qt=1&qto=3";
-        }
-        }
-        
-        homepage = Gatherer.config.exec_address.toString() + "?a=p&p=about&c=" + current_collection.getName()+extra_args;
         preview_button.setEnabled(true);
     }
     }
+    
     /** This method is called to actually layout the components.
      * @see org.greenstone.gatherer.Configuration
@@ -426 +408 @@
     }
     }
+
+    private void configureHomeURL() {
+    
+    // set up the home page for the current collection
+    Collection current_collection = Gatherer.c_man.getCollection();
+    String extra_args = "";
+    SearchTypeManager st_man = current_collection.cdm.searchtype_manager;
+    if (st_man.isMGPPEnabled()) {
+        // we need some more args on the url
+        String search_types = st_man.getSearchTypes();
+        if (search_types.equals("")) {
+        extra_args = "&ct=1&qt=0&qto=3";
+        } else if (search_types.equals("plain")) {
+        extra_args = "&ct=1&qt=0&qto=1";
+        } else if (search_types.equals("form")) {
+        extra_args = "&ct=1&qt=1&qto=2";
+        } else if (search_types.equals("plain,form")) {
+        extra_args = "&ct=1&qt=0&qto=3";
+        } else if (search_types.equals("form,plain")) {
+        extra_args = "&ct=1&qt=1&qto=3";
+        }
+    }
+    
+    homepage = Gatherer.config.exec_address.toString() + "?a=p&p=about&c=" + current_collection.getName()+extra_args;
+    
+    }
+    
 
     /** This class serves as the listener for actions on the build button. */
@@ -495 +504 @@
     
     public void actionPerformed(ActionEvent event) {
+        configureHomeURL();
         Gatherer.self.spawnBrowser(homepage);