Changeset 5815 for trunk

Timestamp:

2003-11-10T14:04:13+13:00 (20 years ago)

Author:

kjdon

Message:

added support for build types and search types in the Collection and CollectionConfiguration classes so that the preview pane can set the right url based on the collection'sbuild type

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/Collection.java (modified) (1 diff)
• collection/CollectionConfiguration.java (modified) (5 diffs)
• gui/PreviewPane.java (modified) (2 diffs)

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

@@ -185 +185 @@
     return collect_cfg.getDescription();
     }
+
+    public String getCollectionType() {
+    return collect_cfg.getBuildType();
+    }
+
+    public String getSearchTypes() {
+    return collect_cfg.getSearchTypes();
+    }
     /** Retrieve a specific directory mapping associated with this collection.
      * @param name The name of the mapping to retrieve as a <strong>String</strong>.

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

@@ -19 +19 @@
     private Element name_element;
     private File file;
+    private String build_type;
     private String creator;
     private String description;
     private String maintainer;
     private String name;
+    private String search_types;
 
     public CollectionConfiguration(File file) {
@@ -54 +56 @@
                 else if(temp.equalsIgnoreCase("maintainer")) {
                 maintainer = tokenizer.nextToken();
+                }
+                else if (temp.equalsIgnoreCase("buildtype")) {
+                build_type = tokenizer.nextToken();
+                }
+                else if (temp.equalsIgnoreCase("searchtype")) {
+                search_types = tokenizer.nextToken();
+                temp = tokenizer.nextToken();
+                if (temp!=null && !temp.equals("")) {
+                    search_types += ","+temp;
+                }
                 }
                 else if(temp.equalsIgnoreCase("collectionmeta")) {
@@ -114 +126 @@
             }
         }
+        // just check a couple of things
+        if (search_types != null && build_type==null) {
+            build_type = "mgpp";
+        } 
         command = null;
         br.close();
@@ -143 +159 @@
     }
 
+    public String getBuildType() {
+    String result = "";
+        
+    if (build_type != null) {
+        result = build_type;
+    }
+    return result;
+    }
+
     public String getCreator() {
     String result = "";
@@ -187 +212 @@
     else if(name != null) {
         result = name;
+    }
+    return result;
+    }
+
+    public String getSearchTypes() {
+    String result = "";
+        
+    if (search_types != null) {
+        result = search_types;
     }
     return result;

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

@@ -43 +43 @@
 import javax.swing.*;
 import org.greenstone.gatherer.Dictionary;
+import org.greenstone.gatherer.collection.Collection;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.util.GURL;
@@ -107 +108 @@
         try {
         // Now load the collection
-        homepage = new URL(Gatherer.config.exec_address.toString() + "?a=p&p=about&c=" + Gatherer.c_man.getCollection().getName());
+        Collection this_coll = Gatherer.c_man.getCollection();
+        String extra_args = "";
+        String build_type = this_coll.getCollectionType();
+        if (build_type.equals("mgpp")) {
+            // we need some more args on the url
+            String search_types = this_coll.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 = new URL(Gatherer.config.exec_address.toString() + "?a=p&p=about&c=" + this_coll.getName()+extra_args);
         String[] args = new String[1];
         args[0] = homepage.toString();