Changeset 3851 for trunk/gsdl3/src

Timestamp:

2003-03-11T16:58:35+13:00 (21 years ago)

Author:

kjdon

Message:

a wide variety of changes, next I will go through and make sure the code is tidy, nad tidy up teh xml a bit, but I wanted to check in all this first.

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3/service

Files:

• GS2Browse.java (modified) (9 diffs)
• GS2Construct.java (modified) (5 diffs)
• GS2MGPPRetrieve.java (modified) (5 diffs)
• GS2MGPPSearch.java (modified) (24 diffs)
• GS2MGSearch.java (modified) (6 diffs)
• GS2Search.java (modified) (7 diffs)
• ServiceRack.java (modified) (1 diff)
• XSLTServices.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Browse.java

@@ -28 +28 @@
 import org.w3c.dom.NodeList; 
 /**
- * A ServicesImpl class for GSDL2-style Classifiers
+ * A ServiceRack class for GSDL2-style Classifiers
  *
  * @author <a href="mailto:[email protected]">Katherine Don</a>
@@ -51 +51 @@
     Element display = doc_.createElement(GSXML.DISPLAY_ELEM);
     display.appendChild(GSXML.createTextElement(doc_, GSXML.DISPLAY_NAME_ELEM,  getTextString(service+".name", lang)));
-    display.appendChild(GSXML.createTextElement(doc_,  GSXML.DISPLAY_SUBMIT_ELEM, getTextString(service+".submit", lang)));
-
-    Element param;
-
+    //display.appendChild(GSXML.createTextElement(doc_,  GSXML.DISPLAY_SUBMIT_ELEM, getTextString(service+".submit", lang)));
+    
+    // need to add in the classifier name info
+    // add <classifier name="CL1">text name</classifier> to the 
+    // display node
+    NodeList classifiers = config_info_.getElementsByTagName(GSXML.CLASSIFIER_ELEM);
+    for (int i=0; i<classifiers.getLength(); i++) {
+        Element cl = (Element)classifiers.item(i);
+        Element disp = (Element)GSXML.getChildByTagName(cl, GSXML.DISPLAY_ELEM);
+        String text = null;
+        if (disp !=null) {
+        text = GSXML.getDisplayText(disp, 
+                        GSXML.DISPLAY_NAME_ELEM, 
+                        lang, "en");
+        }
+        if (text == null || text.equals("")) {
+        // no display element was specified, use the metadata name
+        // for now this looks in the class properties file
+        // this needs to use a general metadata thing instead
+        text = getTextString(cl.getAttribute(GSXML.CLASSIFIER_CONTENT_ATT), lang);
+        }
+        
+        Element cl_elem = doc_.createElement(GSXML.CLASSIFIER_ELEM);
+        cl_elem.setAttribute(GSXML.NAME_ATT, cl.getAttribute(GSXML.NAME_ATT));
+        Element cl_name = GSXML.createTextElement(doc_, GSXML.DISPLAY_NAME_ELEM, text);
+        cl_elem.appendChild(cl_name);
+        
+        display.appendChild(cl_elem);
+        
+    }
+    
     return display;
     
@@ -90 +117 @@
     classifier.setAttribute(GSXML.NAME_ATT, classifier_name);
     result_content.appendChild(classifier);
+
+    // see if there is a stylesheet associated with this classifier
+    Element cl_list = (Element)GSXML.getChildByTagName(config_info_, GSXML.CLASSIFIER_ELEM+GSXML.LIST_MODIFIER);
+    Element cl_info = GSXML.getNamedElement(cl_list,
+                        GSXML.CLASSIFIER_ELEM,
+                        GSXML.NAME_ATT,
+                        classifier_name);
+    if (cl_info !=null) {
+        
+        // find the format child
+        Element cl_format = (Element)GSXML.getChildByTagName(cl_info, GSXML.FORMAT_ELEM);
+        // add it to the result if the result isnt null
+        if (cl_format!=null) {
+        System.out.println("adding format info to browse result!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+        result.appendChild(doc_.importNode(cl_format, true));
+        }
+    }
+        
     DBInfo top_info;
 
@@ -98 +143 @@
     }
 
-    // a substitute template - should be read from config file
-    //String extra = "<stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform'><xsl:template match='document' priority='3'><xsl:param name='collName'>coll-name</xsl:param><xsl:variable name='library' select='ancestor::page/config/library_name'/><td><a href='{$library}?a=r&amp;c={$collName}&amp;r={@name}'><img src='interfaces/default/images/book.gif' width='18' height='11' border='0'/></a></td><td>***</td><td><xsl:value-of select='metadataList/metadata[@name=\"Title\"]'/></td></xsl:template></stylesheet>";
-    //Element extra_doc = converter_.getDOM(extra).getDocumentElement();
-    //result.appendChild(doc_.importNode(extra_doc, true));
-    
     // get the classifier attributes
     String type = top_info.getInfo("childtype");
@@ -189 +229 @@
         Element meta_list = doc_.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
         GSXML.addMetadata(doc_, meta_list, "Title", title);
+        String keyword = child_info.getInfo("Keyword");
+        String source = child_info.getInfo("Source");
+        GSXML.addMetadata(doc_, meta_list, "Keyword", keyword);
+        GSXML.addMetadata(doc_, meta_list, "Source", source);
         node.appendChild(meta_list);
         this_node.appendChild(node);
@@ -194 +238 @@
     }
     
+    System.out.println("result=");
+    System.out.println(converter_.getString(result));
     return result;
     
@@ -203 +249 @@
 
     System.out.println("configuring GS2Browse");
-
+    System.out.println("config info=");
+    System.out.println(converter_.getString(info));
     Element e = null;
     // these entries should reflect the build config file - some services may not be available depending on how the colleciton was built.
@@ -212 +259 @@
     short_service_info_.appendChild(e);
 
+    // set up config info - just a cache of whats in the config file
+    config_info_ = info;
+
     // set up service_info_map_ - for now, just has the same elements as above
     // should have full details about each service incl params lists etc.
@@ -217 +267 @@
     e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_BROWSE);
     e.setAttribute(GSXML.NAME_ATT, CLASSIFIER_SERVICE);
-
-    // get the classifier list out of the service info
-    Node classList = GSXML.getChildByTagName(info, GSXML.CLASSIFIER_ELEM+GSXML.LIST_MODIFIER);
-    e.appendChild(doc_.importNode(classList, true));
-
+    Element cl_list = doc_.createElement(GSXML.CLASSIFIER_ELEM+GSXML.LIST_MODIFIER);
+    e.appendChild(cl_list);
+
+    // add in to the description a simplified list of classifiers
+    NodeList classifiers = config_info_.getElementsByTagName(GSXML.CLASSIFIER_ELEM);
+    
+    for(int i=0; i<classifiers.getLength(); i++) {
+        Element cl = (Element)classifiers.item(i);
+        Element new_cl = (Element)doc_.importNode(cl, false); // just import this node, not the children
+        cl_list.appendChild(new_cl);
+        
+    }
+        
     service_info_map_.put(CLASSIFIER_SERVICE, e);
     

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

@@ -62 +62 @@
     private static final String NEW_FILE_PARAM = "newfile";
     private static final String HANDLE_PARAM = "id";
-
+    private static final String BUILDTYPE_PARAM = "buildType";
+    private static final String BUILDTYPE_MG = "mg";
+    private static final String BUILDTYPE_MGPP = "mgpp";
+    
     // the list of the collections - store between some method calls
     private String[] collection_list_ = null;
@@ -107 +110 @@
     Element param;
     if (service.equals(NEW_SERVICE)) {
-        // have the coll title, about  and creator params
+        // have the coll title, about, buildtype  and creator params
         param = GSXML.createParameterDisplay(doc_, NEW_COL_TITLE_PARAM, getTextString("param."+NEW_COL_TITLE_PARAM, lang), null, null);
         display.appendChild(param);
@@ -113 +116 @@
         display.appendChild(param);
         param = GSXML.createParameterDisplay(doc_, NEW_COL_ABOUT_PARAM, getTextString("param."+NEW_COL_ABOUT_PARAM, lang), null, null);
+        display.appendChild(param);
+
+        String[] types = {BUILDTYPE_MGPP, BUILDTYPE_MG};
+        String[] type_texts = {getTextString("param."+BUILDTYPE_PARAM+"."+BUILDTYPE_MGPP, lang), getTextString("param."+BUILDTYPE_PARAM+"."+BUILDTYPE_MG, lang)};
+        param = GSXML.createParameterDisplay(doc_, BUILDTYPE_PARAM, getTextString("param."+BUILDTYPE_PARAM, lang), types, type_texts);
         display.appendChild(param);
     } else {
@@ -396 +404 @@
     param = GSXML.createParameter(doc_, NEW_COL_ABOUT_PARAM, GSXML.PARAM_TYPE_TEXT, "", null);
     param_list.appendChild(param);
+    String[] types = {BUILDTYPE_MGPP, BUILDTYPE_MG};
+    param = GSXML.createParameter(doc_, BUILDTYPE_PARAM, GSXML.PARAM_TYPE_ENUM_SINGLE, BUILDTYPE_MGPP, types);
+    param_list.appendChild(param);
+
     e.appendChild(param_list);
     service_info_map_.put(NEW_SERVICE, e);
@@ -627 +639 @@
         param.setAttribute(GSXML.VALUE_ATT, (String)params.get(NEW_COL_TITLE_PARAM));
         param_list.appendChild(param);
+        param = doc_.createElement(GSXML.PARAM_ELEM);
+        param.setAttribute(GSXML.NAME_ATT, "buildtype");
+        param.setAttribute(GSXML.VALUE_ATT, (String)params.get(BUILDTYPE_PARAM));
+        param_list.appendChild(param);
         return param_list;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPRetrieve.java

@@ -78 +78 @@
 
 
-    /** Retrieve the structure of a document */
+    /** Retrieve the structure of a document - this function needed as its called specifically on the class name*/
     protected Element processDocumentStructureRetrieve(Element request)
     {
@@ -85 +85 @@
 
 
-    /** Retrieve metadata associated with a document */
+    /** Retrieve metadata associated with a document - this function needed as its called specifically on the class name*/
     protected Element processDocumentMetadataRetrieve(Element request)
     {
@@ -106 +106 @@
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list == null) {
-        System.err.println("GS2Retrieve, DocumentContentRetrieve Error: missing paramList.\n");
+        System.err.println("GS2MGPPRetrieve, DocumentContentRetrieve Error: missing paramList.\n");
         return result;  // Return the empty result
     }
@@ -113 +113 @@
 
     // Process the request parameters
+    // are there any???
     Element param = (Element) param_list.getFirstChild();
     while (param != null) {
@@ -119 +120 @@
         }
         else {
-        //
+        // this looks for a level param but I think we dont use it
         if (param.getAttribute(GSXML.NAME_ATT) == LEVEL_PARAM) {
             level = GSXML.getValue(param);

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPSearch.java

@@ -47 +47 @@
     extends GS2Search {
 
-    // these strings must match what is found in the properties file
-    // the services on offer
+    // extra services offered by mgpp collections
     private static final String FIELD_QUERY_SERVICE = "FieldQuery";
     private static final String ADVANCED_FIELD_QUERY_SERVICE = "AdvancedFieldQuery";
 
-    // Parameters used
-    private static final String INDEX_PARAM = "index";
+    // extra parameters used
     private static final String LEVEL_PARAM = "level";
     private static final String RANK_PARAM = "sortBy";
@@ -70 +68 @@
     private static final String FIELD_COMBINE_PARAM_NOT = "2";
 
-    // Elements used in the config file that are specific to this class
-    private static final String DEFAULT_INDEX_ELEM = "defaultIndex";
-    private static final String DEFAULT_LEVEL_ELEM = "defaultLevel";
-    private static final String INDEX_ELEM = "index";
-    private static final String LEVEL_ELEM = "level";
-
+    private static final int TEXT_QUERY = 0;
+    private static final int SIMPLE_QUERY = 1;
+    private static final int ADVANCED_QUERY = 2;
+    
+    protected static final String FIELD_ATT = "field";
     private MGPPWrapper mgpp_src_=null;
 
-    private String default_index_=null;
     private String default_level_=null;
-
     
     /** constructor */
@@ -99 +94 @@
     System.out.println("Configuring GS2MGPPSearch...");
 
-    // Get the default index out of <defaultIndex> (buildConfig.xml)
-    Element def = (Element) GSXML.getChildByTagName(info, DEFAULT_INDEX_ELEM);
-    if (def != null) {
-        default_index_ = def.getAttribute(GSXML.NAME_ATT);
-    }
-    if (default_index_ == null || default_index_.equals("")) {
-        System.err.println("Error: default index not specified!");
-        return false;
-    }
-    // System.out.println("Default index: " + default_index_);
-
     // Get the default level out of <defaultLevel> (buildConfig.xml)
-    def = (Element) GSXML.getChildByTagName(info, DEFAULT_LEVEL_ELEM);
+    Element def = (Element) GSXML.getChildByTagName(info, DEFAULT_LEVEL_ELEM);
     if (def != null) {
         default_level_ = def.getAttribute(GSXML.NAME_ATT);
@@ -119 +103 @@
         return false;
     }
-    // System.out.println("Default level: " + default_level_);
 
     // the default level is also the level which gdbm is expecting
     mgpp_src_.setReturnLevel(default_level_);
+    mgpp_src_.setReturnTerms(true);
+    mgpp_src_.setQueryLevel(default_level_);
 
     // set up which services are available for this collection
@@ -140 +125 @@
     // set up service_info_map_ - for now, just has the same elements as above
     // should have full details about each service incl params lists etc.
-    // do the text query one - for now a static list. later use buildcfg.xml values to dynamically change this
     Element fq_service_full = (Element) fq_service.cloneNode(true);
     Element fq_param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
@@ -168 +152 @@
         if (len > 1) { // add index param to list only if more than one index specified
         String [] inds  = new String[len];
+        String [] ind_names = new String[len];
         for (int i=0; i<len; i++) {
             inds[i] = ((Element)indexes.item(i)).getAttribute(GSXML.NAME_ATT);
+            if (display) {
+            Element disp = (Element)GSXML.getChildByTagName(indexes.item(i), GSXML.DISPLAY_ELEM);
+            ind_names[i] = GSXML.getDisplayText(disp, GSXML.DISPLAY_NAME_ELEM, lang, "en");
+            }
+            //Element display_name = (Element)GSXML.getChildByTagName(indexes.item(i), GSXML.DISPLAYNAME_ELEM)
+            //ind_names[i] = GSXML.getNodeText((Element)GSXML.getChildByTagName(indexes.item(i), GSXML.DISPLAYNAME_ELEM));
+            // }
         }
         if (display) {
             // use the same index names for now - should get these out of the config info
-            param = GSXML.createParameterDisplay(doc_, INDEX_PARAM, getTextString("param."+INDEX_PARAM, lang), inds, inds);
+            param = GSXML.createParameterDisplay(doc_, INDEX_PARAM, getTextString("param."+INDEX_PARAM, lang), inds, ind_names);
         } else {
             param = GSXML.createParameter(doc_, INDEX_PARAM, GSXML.PARAM_TYPE_ENUM_SINGLE, default_index_, inds);
@@ -185 +177 @@
         if (len > 1) { // add level param to list only if more than one index specified
         String [] levs  = new String[len];
+        String [] lev_names = new String[len];
         for (int i=0; i<len; i++) {
             levs[i] = ((Element)levels.item(i)).getAttribute(GSXML.NAME_ATT);
+            if (display) {
+            String lname = "level."+levs[i];
+            System.out.println("lname="+lname);
+            //lev_names[i] = levs[i];
+            lev_names[i] = getTextString(lname, lang);
+            }
         }
         if (display) {
-            param =  GSXML.createParameterDisplay(doc_, LEVEL_PARAM, getTextString("param."+LEVEL_PARAM, lang), levs, levs);
+            param =  GSXML.createParameterDisplay(doc_, LEVEL_PARAM, getTextString("param."+LEVEL_PARAM, lang), levs, lev_names);
         } else {
             param = GSXML.createParameter(doc_, LEVEL_PARAM, GSXML.PARAM_TYPE_ENUM_SINGLE, default_level_, levs);
@@ -231 +230 @@
         
         }
+
     } else if (name.equals(FIELD_FIELD_PARAM)) {
         
-        // the field list - should be read from config file
-        String [] vals2 = {"TX", "SU", "TI", "OR"};
-        String [] vals2_texts = {"TextOnly", "Subject", "Title", "Organization"};
+        // the field list -  read from config file
+        Element field_list = (Element)GSXML.getChildByTagName(config_info_, GSXML.FIELD_ELEM+GSXML.LIST_MODIFIER);
+        NodeList fields = field_list.getElementsByTagName(GSXML.FIELD_ELEM);
+        int len = fields.getLength();
+        String [] f_names = new String [len];
+        String [] f_texts = new String [len];
+
+        for (int i=0; i< len;i++) {
+        f_names[i] = ((Element)fields.item(i)).getAttribute(GSXML.SHORTNAME_ATT);
+        if (display) {
+            // these should be changed to a text element based on lang
+            f_texts[i] = ((Element)fields.item(i)).getAttribute(GSXML.NAME_ATT);
+        }
+
+        }
+        // String [] vals2 = {"TX", "SU", "TI", "OR"};
+        //String [] vals2_texts = {"TextOnly", "Subject", "Title", "Organization"};
         
         if (display) {
-        param = GSXML.createParameterDisplay(doc_, FIELD_FIELD_PARAM, getTextString("param."+FIELD_FIELD_PARAM, lang), vals2, vals2_texts);
+        param = GSXML.createParameterDisplay(doc_, FIELD_FIELD_PARAM, getTextString("param."+FIELD_FIELD_PARAM, lang), f_names, f_texts);
         
         } else {
-        param = GSXML.createParameter(doc_, FIELD_FIELD_PARAM, GSXML.PARAM_TYPE_ENUM_SINGLE, "", vals2 );
+        param = GSXML.createParameter(doc_, FIELD_FIELD_PARAM, GSXML.PARAM_TYPE_ENUM_SINGLE, "", f_names );
         
         }
@@ -273 +287 @@
      * otherwise it creates the description version
      */
-    protected boolean createTextQueryParamList(Element param_list, boolean display,
+    protected boolean createTextQueryParamList(Element param_list, 
+                           boolean display,
                            String lang)
     {
@@ -280 +295 @@
     createParameter(INDEX_PARAM, param_list, display, lang);
     createParameter(LEVEL_PARAM, param_list, display, lang);
+    createParameter(CASE_PARAM, param_list, display, lang);
+    createParameter(STEM_PARAM, param_list, display, lang);
+    createParameter(MATCH_PARAM, param_list, display, lang);
     createParameter(RANK_PARAM, param_list, display, lang);
-    return super.createTextQueryParamList(param_list, display, lang);
-    }
+    createParameter(MAXDOCS_PARAM, param_list, display, lang);
+    createParameter(QUERY_PARAM, param_list, display, lang);
+
+    return true;
+    }
+
+
+    // for now, the field queries just use the default index.
+    // however, it is entirely possible to create two indexes with different 
+    // metadata. then you run into problems with displaying the form - you 
+    // need to use javascript to change teh field and maybe level lists 
+    // depending on which index is selected, or have the index preselected 
+    // before going to the query form
 
 
@@ -292 +321 @@
                         String lang)
     {
+    createParameter(LEVEL_PARAM, param_list, display, lang);
     createParameter(MATCH_PARAM, param_list, display, lang);
-    createParameter(LEVEL_PARAM, param_list, display, lang);
     createParameter(CASE_PARAM, param_list, display, lang);
     createParameter(STEM_PARAM, param_list, display, lang);
@@ -386 +415 @@
     return display;
     }
-
     
+    // the following three functions are needed so the base class can 
+    // call the process+SERVICE_NAME methods
     /** process a text query */
-    protected Element processTextQuery(Element request)
+    protected Element processTextQuery(Element request) {
+    return processAnyQuery(request, TEXT_QUERY);
+    }
+
+    /** process a field query */    
+    protected Element processFieldQuery(Element request) {
+    return processAnyQuery(request, SIMPLE_QUERY);
+    }
+
+    /** process an advanced field query */
+    protected Element processAdvancedFieldQuery(Element request) {
+    return processAnyQuery(request, ADVANCED_QUERY);
+    }
+    
+    /** process a  query */
+    protected Element processAnyQuery(Element request, int query_type)
     {
+
+    String service_name=null;
+    String empty_query_test_param=null;
+    // set up the type specific bits
+    switch (query_type) {
+    case TEXT_QUERY:
+        service_name = TEXT_QUERY_SERVICE; 
+        empty_query_test_param = QUERY_PARAM;
+        break;
+    case SIMPLE_QUERY:
+        service_name = FIELD_QUERY_SERVICE;
+        empty_query_test_param = FIELD_QUERY_PARAM;
+        break;
+    case ADVANCED_QUERY:
+        service_name = ADVANCED_FIELD_QUERY_SERVICE;
+        empty_query_test_param = FIELD_QUERY_PARAM;
+        break;
+    default:
+        // should never get here
+        System.out.println("wrong query type!!");
+        return null;
+    }
+    
     // Create a new (empty) result message
     Element result = doc_.createElement(GSXML.RESPONSE_ELEM);
-    String from = GSPath.appendLink(cluster_name_, TEXT_QUERY_SERVICE);
+    // set the from att
+    String from = GSPath.appendLink(cluster_name_, service_name);
     result.setAttribute(GSXML.FROM_ATT, from);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
     Element result_content = doc_.createElement(GSXML.CONTENT_ELEM);
     result.appendChild(result_content);
-
+    
     // Get the parameters of the request
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
@@ -410 +479 @@
 
     // Make sure a query has been specified
-    String query = (String) params.get(QUERY_PARAM);
+    String query = (String) params.get(empty_query_test_param);
     if (query == null || query == "") {
         return result;  // Return the empty result
@@ -421 +490 @@
     }
 
-    // The location of the MGPP text files
+    // set up mgpp_src
     String basedir = GSFile.collectionBaseDir(site_home_, cluster_name_);
     String indexdir = GSFile.collectionIndexPath(cluster_name_, index);
@@ -428 +497 @@
 
     mgpp_src_.loadIndexData(basedir, indexdir);
-
     setStandardQueryParams(params);
+    
+    // if field search, create the query string
+    switch (query_type) {
+    case SIMPLE_QUERY:
+        query = parseFieldQueryParams(params);
+        break;
+    case ADVANCED_QUERY:
+        query = parseAdvancedFieldQueryParams(params);
+        break;
+    }
+    // run the query
         mgpp_src_.runQuery(query);
     MGPPQueryResult mqr= mgpp_src_.getQueryResult();
-    long totalDocs = mqr.getTotalDocs();
-    System.out.println("Total documents: " + totalDocs);
-
-    // Get the docnums out, and convert to HASH ids
-    Vector docs = mqr.getDocs();
-    if (docs.size()==0) {
-        System.out.println("Warning: No results found...\n");
-        // return result;
-    }
-
+
+    // build up the response
+    
     // Create a metadata list to store information about the query results
     Element metadata_list = GSXML.addMetaList(doc_, result);
 
     // Add a metadata element specifying the number of matching documents
+    long totalDocs = mqr.getTotalDocs();
     Element num_matches_elem = doc_.createElement(GSXML.METADATA_ELEM);
     num_matches_elem.setAttribute(GSXML.NAME_ATT, "numDocsMatched");
@@ -452 +525 @@
 
     // Create a document list to store the matching documents, and add them
+    Vector docs = mqr.getDocs();
     Element document_list = doc_.createElement(GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
     result_content.appendChild(document_list);
@@ -462 +536 @@
 
     // Create a term list to store the term information, and add it
+    String query_level = (String)params.get(LEVEL_PARAM); // the current query level
     Element term_list = doc_.createElement(GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
     result_content.appendChild(term_list);
@@ -467 +542 @@
     for (int t = 0; t < terms.size(); t++) {
         MGPPTermInfo term_info = (MGPPTermInfo) terms.get(t);
-
-        String term = term_info.term_;
-        int stem_method = term_info.stem_method_;
+        
+        Element term_elem = doc_.createElement(GSXML.TERM_ELEM);
+        term_elem.setAttribute(GSXML.NAME_ATT, term_info.term_);
+        term_elem.setAttribute(STEM_ATT, "" + term_info.stem_method_);
+        term_elem.setAttribute(FREQ_ATT, "" + term_info.term_freq_);
+        term_elem.setAttribute(NUM_DOCS_MATCH_ATT, "" + term_info.match_docs_);
+        String field = term_info.tag_;
+        if (field.equals(query_level)) {
+        // ignore
+        field = "";
+        }
+        term_elem.setAttribute(FIELD_ATT, field);
+        
         Vector equiv_terms = term_info.equiv_terms_;
-
-        Element term_elem = doc_.createElement(GSXML.TERM_ELEM);
-        term_elem.setAttribute(GSXML.NAME_ATT, term);
-        term_elem.setAttribute(STEM_ATT, "" + stem_method);
-
         Element equiv_term_list = doc_.createElement(EQUIV_TERM_ELEM+GSXML.LIST_MODIFIER);
         term_elem.appendChild(equiv_term_list);
-
+        
         for (int et = 0; et < equiv_terms.size(); et++) {
         String equiv_term = (String) equiv_terms.get(et);
@@ -489 +569 @@
         }
 
-        term_elem.setAttribute(FREQ_ATT, "" + term_info.term_freq_);
         term_list.appendChild(term_elem);
     }
@@ -495 +574 @@
     return result;
     }
-
-
-    protected Element processFieldQuery(Element request) {
-    return processAnyFieldQuery(request, "simple");
-    }
-
-
-    protected Element processAdvancedFieldQuery(Element request) {
-    return processAnyFieldQuery(request, "advanced");
-    }
-
-
-    /** process a fielded query */
-    protected Element processAnyFieldQuery(Element request, String type) {
-    
-    System.out.println("processing any Field Query...");
-    Element result = doc_.createElement(GSXML.RESPONSE_ELEM);
-    String from = null;
-    if (type.equals("simple")) {
-        from = GSPath.appendLink(cluster_name_, FIELD_QUERY_SERVICE);
-    } else {
-        from = GSPath.appendLink(cluster_name_, ADVANCED_FIELD_QUERY_SERVICE);
-    }
-    result.setAttribute(GSXML.FROM_ATT, from);
-    result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_QUERY);
-    
-    // get param list
-    Element param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    if (param_list==null) {
-        System.err.println("GS2MGPPSearch, FieldQuery Error: no param list in request!");
-        return result; // empty result
-    }
-
-    HashMap params = GSXML.extractAllParams(param_list);
-    printHash(params);
-
-    //check one of the params to see if it is present
-    String test_param = (String)params.get(FIELD_QUERY_PARAM);
-    if (test_param == null) { // no query
-        return result;
-    }
-
-    // for now we are using the default index
-    String index = default_index_;
-    
-    // now set up the mgpp stuff
-    String basedir = GSFile.collectionBaseDir(site_home_, 
-                          cluster_name_);
-    String indexdir = GSFile.collectionIndexPath(cluster_name_, index);
-    
-    mgpp_src_.loadIndexData(basedir, indexdir);
-    setStandardQueryParams(params);
-    
-    String query="";
-    if (type.equals("simple")) {
-        query = parseFieldQueryParams(params);
-    } else if (type.equals("advanced")) {
-        query = parseAdvancedFieldQueryParams(params);
-    }
-    System.out.println("query="+query);
-    mgpp_src_.runQuery(query);
-    MGPPQueryResult mqr= mgpp_src_.getQueryResult();
-    
-    // get the docnums out, and convert to HASH ids
-    Vector docs = mqr.getDocs();
-    if (docs.size()==0) {
-        // no docs found
-        return result;
-    }
-    // create a documentList element
-    Element c = doc_.createElement(GSXML.CONTENT_ELEM);
-    result.appendChild(c);
-    Element document_list = doc_.createElement(GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
-    c.appendChild(document_list);
-    // add each document
-    for (int d=0; d<docs.size(); d++) {
-        long docnum = ((MGPPDocInfo)docs.elementAt(d)).num_;
-        String id = gdbm_src_.docnum2Oid(docnum);
-        Element doc_node = createDocumentNodeElement(id);
-        document_list.appendChild(doc_node);
-    }
-    return result;
-    }
-
-
 
     // should probably use a list rather than map
     protected boolean setStandardQueryParams(HashMap params) {
 
-    // set the default ones
-    mgpp_src_.setReturnTerms(true);
     Set entries = params.entrySet();
     Iterator i = entries.iterator();
@@ -620 +612 @@
     }
 
+    /** combines all the field params into a single query
+     * - for simple field query */
     protected String parseFieldQueryParams(HashMap params) {
 
@@ -644 +638 @@
     return final_query.toString();
     }
-    
+
+    /** combines all the field params into a single query
+     * - for advanced field query */   
     protected String parseAdvancedFieldQueryParams(HashMap params) {
 
@@ -697 +693 @@
     }
     }
+    
     protected String addStemAndCase(String q, String s, String c) {
     String mods = "#";
@@ -721 +718 @@
     }
 
-    protected void printHash(HashMap map) {
-    System.out.println("Map entries are :");
-    Set entries = map.entrySet();
-    Iterator i = entries.iterator();
-    while (i.hasNext()) {
-        Map.Entry m = (Map.Entry)i.next();
-        String name = (String)m.getKey();
-        String value = (String)m.getValue();
-        System.out.println(name+"="+value);
-    }  
-    }
 
 }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGSearch.java

@@ -4 +4 @@
  *
  *    This program is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation; either version 2 of the License, or
+ *   the Free Software Foundation; either version 2 of the License, or
  *    (at your option) any later version.
  *
@@ -41 +40 @@
  *
  * @author <a href="mailto:[email protected]">Katherine Don</a>
+ * @author <a href="mailto:[email protected]">Michael Dewsnip</a>
  * @version $Revision$
  */
@@ -47 +47 @@
     extends GS2Search {
 
-    // Parameters used
-    private static final String INDEX_PARAM = "index";
-
-    // Elements used in the config file that are specific to this class
-    private static final String DEFAULT_INDEX_ELEM = "defaultIndex";
-    private static final String INDEX_ELEM = "index";
 
     private MGWrapper mg_src_ = null;
-
-    private String default_index_ = null;
 
 
@@ -67 +59 @@
 
     /** configure this service */
-    public boolean configure(Element info)
+    /*    public boolean configure(Element info)
     {
     // Do generic configuration
@@ -76 +68 @@
     System.out.println("Configuring GS2MGSearch...");
 
-    // Get the default index out of <defaultIndex> (buildConfig.xml)
-    Element def = (Element) GSXML.getChildByTagName(info, DEFAULT_INDEX_ELEM);
-    if (def != null) {
-        default_index_ = def.getAttribute(GSXML.NAME_ATT);
-    }
-    if (default_index_ == null || default_index_.equals("")) {
-        System.err.println("Error: default index not specified!");
-        return false;
-    }
-    // System.out.println("Default index: " + default_index_);
-
     return true;
-    }
+    }*/
 
 
@@ -136 +117 @@
     // the query form
     createParameter(INDEX_PARAM, param_list, display, lang);
-    return super.createTextQueryParamList(param_list, display, lang);
+    createParameter(CASE_PARAM, param_list, display, lang);
+    createParameter(STEM_PARAM, param_list, display, lang);
+    createParameter(MATCH_PARAM, param_list, display, lang);
+    createParameter(MAXDOCS_PARAM, param_list, display, lang);
+    createParameter(QUERY_PARAM, param_list, display, lang);
+
+    return true;
     }
 

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Search.java

@@ -30 +30 @@
 /**
  *
- * @author <a href="mailto:[email protected]">Katherine Don</a>
+ * @author <a href="mailto:[email protected]">Michael Dewsnip</a>
  * @version $Revision$
  */
@@ -42 +42 @@
 
     // Parameters used
+    protected static final String INDEX_PARAM = "index";
     protected static final String CASE_PARAM = "case";
     protected static final String STEM_PARAM = "stem";
@@ -58 +59 @@
     protected static final String FREQ_ATT = "freq";
 
+    // Elements used in the config file that are specific to this class
+    protected static final String DEFAULT_INDEX_ELEM = "defaultIndex";
+    protected static final String DEFAULT_LEVEL_ELEM = "defaultLevel";
+    protected static final String INDEX_ELEM = "index";
+    protected static final String LEVEL_ELEM = "level";
+
     protected GDBMWrapper gdbm_src_ = null;
 
     protected Element config_info_ = null;
+
+    /** the default index */
+    protected String default_index_ = null;
 
 
@@ -75 +85 @@
     System.out.println("Configuring GS2Search...");
     config_info_ = info;
+
+    // Get the default index out of <defaultIndex> (buildConfig.xml)
+    Element def = (Element) GSXML.getChildByTagName(info, DEFAULT_INDEX_ELEM);
+    if (def != null) {
+        default_index_ = def.getAttribute(GSXML.NAME_ATT);
+    }
+    if (default_index_ == null || default_index_.equals("")) {
+        System.err.println("Error: default index not specified!");
+        return false;
+    }
 
     // these entries should reflect the build config file - some services may not be available depending on how the colleciton was built.
@@ -103 +123 @@
 
     /** creates a new param element and adds it to the param list */
-    protected void createParameter(String name, Element param_list, boolean display,
-                   String lang)
+    protected void createParameter(String name, Element param_list, 
+                   boolean display, String lang)
     {
     Element param=null;
@@ -162 +182 @@
      * otherwise it creates the description version
      */
-    protected boolean createTextQueryParamList(Element param_list, boolean display,
-                           String lang)
-    {
-    // the order they are specified here is the order they appear on 
-    // the query form
-    createParameter(CASE_PARAM, param_list, display, lang);
-    createParameter(STEM_PARAM, param_list, display, lang);
-    createParameter(MATCH_PARAM, param_list, display, lang);
-    createParameter(MAXDOCS_PARAM, param_list, display, lang);
-    createParameter(QUERY_PARAM, param_list, display, lang);
-    return true;
-    }
-
+    protected abstract boolean createTextQueryParamList(Element param_list, 
+                            boolean display,
+                            String lang);
 
     /** creates a display element containing all the text strings needed to display
@@ -182 +192 @@
     // Create a service display for the basic text query service
     Element display = doc_.createElement(GSXML.DISPLAY_ELEM);
-    display.appendChild(GSXML.createTextElement(doc_, GSXML.DISPLAY_NAME_ELEM,
-                            getTextString(service+".name", lang)));
-    display.appendChild(GSXML.createTextElement(doc_, GSXML.DISPLAY_SUBMIT_ELEM,
-                            getTextString(service+".submit", lang)));
+    display.appendChild(GSXML.createTextElement(doc_, GSXML.DISPLAY_NAME_ELEM, getTextString(service+".name", lang)));
+    display.appendChild(GSXML.createTextElement(doc_, GSXML.DISPLAY_SUBMIT_ELEM, getTextString(service+".submit", lang)));
 
     // now need to add in the params

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

@@ -69 +69 @@
     /** a converter class to create Documents etc */
     protected XMLConverter converter_ = null;
+
+    /** the original config info - if need to store it */
+    protected Element config_info_ = null;
 
     /** XML element for describe requests - the container doc */

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/XSLTServices.java

@@ -100 +100 @@
   }
   
-  /** configure this service */
-  public boolean configure(Element info) {
-    
-    System.out.println("configuring XSLTServices");
-    config_info_ = info;
+    /** configure this service */
+    public boolean configure(Element info) {
+      
+      System.out.println("configuring XSLTServices");
+      config_info_ = info;
     try {
       System.out.println("XSLTService::configure() called with:");