Changeset 3442

Timestamp:

2002-10-04T13:20:11+12:00 (22 years ago)

Author:

kjdon

Message:

index and level info now dynamic

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/MGPPGDBMService.java (modified) (9 diffs)

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

@@ -44 +44 @@
 public class MGPPGDBMService 
     extends ServiceModule {
-    // not sure where this should go - maybe need a greenstone constants?
-    // or is it per collection, so should be specified in the buildcfg.xml?
-    public static final String DEFAULT_TEXT_LEVEL="Section";
+
     private MGPPWrapper mgpp_src_=null;
     private GDBMWrapper gdbm_src_=null;
     
     private String default_index_=null;
+    private String default_level_=null;
+
     public MGPPGDBMService() {
     mgpp_src_ = new MGPPWrapper();
@@ -56 +56 @@
 
     }
-    /** passes the request Element to the appropriate service function*/
-    protected Element processService(String name, Element request) {
-
-    // dont need to check that the service name is  supported for this particular object, because that has been checked by ServiceModule
-    if (name.equals("TextQuery")) {
-        return processTextQuery(request);
-    } else if(name.equals("FieldQuery")) {
-        return processFieldQuery(request);
-    } else if (name.equals("ResourceRetrieve")) {
-        return processResourceRetrieve(request);
-    } else if (name.equals("MetadataRetrieve")) {
-        return processMetadataRetrieve(request);
-    }
-    
-    System.err.println("MGPPGDBMService:should never get here. service type wrong:"+name);
-    return null;
-    
-    
-    }
     
 
@@ -81 +62 @@
 
     System.out.println("configuring MGPPGDBMService");
-    // get the default index out of metadata
-    NodeList metadata = info.getElementsByTagName("metadata");
-    String name=null;
-    for(int i=0; i<metadata.getLength(); i++) {
-        Element e = (Element)metadata.item(i);
-        name = e.getAttribute("name");
-        if (name.equals("defaultIndex")) {
-        default_index_ = GSXML.getValue(e);
-        break;
-        }
-    }
+
+    // get the default index from <defaultIndex>
+    Element def = (Element)GSXML.getChildByTagName(info, "defaultIndex");
+    if (def !=null) {
+        default_index_ = def.getAttribute("name");
+    }
+    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>
+    def = (Element)GSXML.getChildByTagName(info, "defaultLevel");
+    if (def !=null) {
+        default_level_ = def.getAttribute("name");
+    }
+    if (default_level_==null||default_level_.equals("")) {
+        System.err.println("Error: default level not specified!");
+        return false;
+    }
+    // the default level is also the level which gdbm is expecting
+    mgpp_src_.setReturnLevel(default_level_);
+    System.out.println("default level="+default_level_);
+
+    // set up which services are available for this collection
     Element e = null;
     // these entries should reflect the build config file - some services may not be available depending on how the collection was built.
+
     // set up short_service_info_ - for now just has name and type
     e = doc_.createElement("service");
@@ -123 +120 @@
     e.setAttribute("name", "TextQuery");
     Element paramList = doc_.createElement("paramList");
+    Element param;
+    // first do index and level params
+
+    // the index info - read from config file
+    Element index_list = (Element)GSXML.getChildByTagName(info, "indexList");
+    NodeList indexes = index_list.getElementsByTagName("index");
+    int len = indexes.getLength();
+    if (len > 1) {
+        // add level param to list
+        String [] inds  = new String[len];
+        for (int i=0; i<len; i++) {
+        inds[i] = ((Element)indexes.item(i)).getAttribute("name");
+        }
+        param = GSXML.createParameter(doc_, "index", GSXML.PARAM_TYPE_ENUM, default_index_, inds);
+        paramList.appendChild(param);
+    } // else dont need to add it
+
+    // the level info - read from config file
+    Element level_list = (Element)GSXML.getChildByTagName(info, "levelList");
+    NodeList levels = level_list.getElementsByTagName("level");
+    len = levels.getLength();
+    if (len > 1) {
+        // add level param to list
+        String [] levs  = new String[len];
+        for (int i=0; i<len; i++) {
+        levs[i] = ((Element)levels.item(i)).getAttribute("name");
+        }
+        param = GSXML.createParameter(doc_, "queryLevel", GSXML.PARAM_TYPE_ENUM, default_level_, levs);
+        paramList.appendChild(param);
+    } // else dont need to add it
+
     // boolean params
-    Element param = GSXML.createParameter(doc_, "case", GSXML.PARAM_TYPE_BOOLEAN, "1", null);
+    param = GSXML.createParameter(doc_, "case", GSXML.PARAM_TYPE_BOOLEAN, "1", null);
     paramList.appendChild(param);
     param = GSXML.createParameter(doc_, "stem", GSXML.PARAM_TYPE_BOOLEAN, "1", null);
@@ -135 +163 @@
     param = GSXML.createParameter(doc_, "sortBy", GSXML.PARAM_TYPE_ENUM, "rank", vals1 );
     paramList.appendChild(param);
-    String [] vals2 = {"Document", "Section"};
-    param = GSXML.createParameter(doc_, "queryLevel", GSXML.PARAM_TYPE_ENUM, "Section", vals2);
-    paramList.appendChild(param);
+
     // Integer params
     param = GSXML.createParameter(doc_, "maxDocs", GSXML.PARAM_TYPE_INTEGER, "10", null);
@@ -163 +189 @@
     service_info_map_.put("MetadataRetrieve", e);
 
-    
-    if (gdbm_src_.openDatabase(site_home_+"/collect/"+collection_name_+"/index/text/"+collection_name_+".ldb", GDBMWrapper.READER)) {
+    if (gdbm_src_.openDatabase(GSFile.GDBMDatabaseFile(site_home_, collection_name_), GDBMWrapper.READER)) {
         return true;
     }
@@ -173 +198 @@
     }
        
+
+    /** passes the request Element to the appropriate service function*/
+    protected Element processService(String name, Element request) {
+
+    // dont need to check that the service name is  supported for this particular object, because that has been checked by ServiceModule
+    if (name.equals("TextQuery")) {
+        return processTextQuery(request);
+    } else if(name.equals("FieldQuery")) {
+        return processFieldQuery(request);
+    } else if (name.equals("ResourceRetrieve")) {
+        return processResourceRetrieve(request);
+    } else if (name.equals("MetadataRetrieve")) {
+        return processMetadataRetrieve(request);
+    }
+    
+    System.err.println("MGPPGDBMService:should never get here. service type wrong:"+name);
+    return null;
+    
+    
+    }
 
     /** process a text query */
@@ -209 +254 @@
 
     HashMap params = GSXML.extractParams(param_elem);
-    String index = (String)params.get("Index"); 
+    String index = (String)params.get("index"); 
     if (index==null) { // if its not present, use the default index
         index=default_index_;
@@ -310 +355 @@
         // retrieve a doc
         if (level==null) {
-        level=DEFAULT_TEXT_LEVEL;
+        level=default_level_;
         }
         // whether to just get the doc, or all assoc files too.