Changeset 13916

Timestamp:

2007-02-15T10:53:23+13:00 (17 years ago)

Author:

kjdon

Message:

levels now use displayItems for display text in the same way that indexes do.

Location:

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

Files:

• AbstractGS2FieldSearch.java (modified) (4 diffs)
• GS2LuceneRetrieve.java (modified) (1 diff)
• GS2MGPPRetrieve.java (modified) (1 diff)
• GS2MGPPSearch.java (modified) (1 diff)

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

@@ -75 +75 @@
 
     protected static final String DEFAULT_LEVEL_ELEM = "defaultLevel";
+    protected static final String DEFAULT_GDBM_LEVEL_ELEM = "defaultGDBMLevel";
     protected static final String LEVEL_ELEM = "level";
     protected static final String FIELD_ATT = "field";
@@ -87 +88 @@
     protected String NOT_OPERATOR = "!";
     
-   // the default level for retrieval - and we'll use it for searching too
+   // the default level for searching
     protected String default_level=null;
-
+    // default level for gdbm db
+    protected String default_gdbm_level = null;
     // which search services will we offer??
     protected boolean plain_search = false;
@@ -153 +155 @@
     Element def = (Element) GSXML.getChildByTagName(info, DEFAULT_LEVEL_ELEM);
     if (def != null) {
-        this.default_level = def.getAttribute(GSXML.NAME_ATT);
+        this.default_level = def.getAttribute(GSXML.SHORTNAME_ATT);
     }
     if (this.default_level == null || this.default_level.equals("")) {
-        logger.error("default level not specified!");
-        return false;
-    }
-
-    
+        logger.error("default level not specified!, assuming Doc");
+        this.default_level = "Doc";
+    }
+
+    // Get the default GDBM level
+    def = (Element) GSXML.getChildByTagName(info, DEFAULT_GDBM_LEVEL_ELEM);
+    if (def != null) {
+        this.default_gdbm_level = def.getAttribute(GSXML.SHORTNAME_ATT);
+    }
+    if (this.default_gdbm_level == null || this.default_gdbm_level.equals("")) {
+        logger.error("default gdbm level not specified!, assuming Sec");
+        this.default_gdbm_level = "Sec";
+    }
+    
+    // get display info from extra info - for levels
+    if (extra_info !=null) {
+        Document owner = info.getOwnerDocument();
+    
+        NodeList levels = info.getElementsByTagName(GSXML.LEVEL_ELEM);
+        Element config_search = (Element)GSXML.getChildByTagName(extra_info, GSXML.SEARCH_ELEM);
+        
+        for (int i=0; i<levels.getLength();i++) {
+        Element lev = (Element)levels.item(i);
+        String name = lev.getAttribute(GSXML.NAME_ATT);
+        Element node_extra = GSXML.getNamedElement(config_search,
+                               GSXML.LEVEL_ELEM,
+                               GSXML.NAME_ATT,
+                               name);
+        if (node_extra == null) {
+            logger.error("haven't found extra info for level named "+name);
+            continue;
+        }
+        
+        // get the display elements if any - displayName
+        NodeList display_names = node_extra.getElementsByTagName(GSXML.DISPLAY_TEXT_ELEM);
+        if (display_names !=null) {
+            for (int j=0; j<display_names.getLength(); j++) {
+            Element e = (Element)display_names.item(j);
+            lev.appendChild(owner.importNode(e, true));
+            }
+        }
+        } // for each level
+    }
+ 
     // the format info is the same for all services
     Element format_info = (Element)format_info_map.get(TEXT_QUERY_SERVICE);
@@ -330 +371 @@
     NodeList levels = level_list.getElementsByTagName(LEVEL_ELEM);
     for (int i=0; i<levels.getLength(); i++) {
-        level_ids.add(((Element)levels.item(i)).getAttribute(GSXML.NAME_ATT));
-        level_names.add(getTextString("level."+level_ids.get(i), lang));
-    }
-    
+        Element level = (Element)levels.item(i);
+        String shortname = level.getAttribute(GSXML.SHORTNAME_ATT);
+        if (shortname.equals("")) {
+        continue;
+        }
+        level_ids.add(shortname);
+        String display_name = GSXML.getDisplayText(level, GSXML.DISPLAY_TEXT_NAME, lang, "en");
+        if (display_name.equals("")) {
+        // we'll use the name, and the dictionary
+        display_name = level.getAttribute(GSXML.NAME_ATT);
+        if (display_name.equals("")) {
+            display_name = shortname;
+        } else {
+            display_name = getTextString("level."+display_name, lang);
+        }
+        }
+        level_names.add(display_name);
+    }
     }
 

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

@@ -87 +87 @@
     Element def = (Element) GSXML.getChildByTagName(info, DEFAULT_LEVEL_ELEM);
     if (def != null) {
-        this.default_level = def.getAttribute(GSXML.NAME_ATT);
+        this.default_level = def.getAttribute(GSXML.SHORTNAME_ATT);
     }
     if (this.default_level == null || this.default_level.equals("")) {

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

@@ -72 +72 @@
     Element def = (Element) GSXML.getChildByTagName(info, DEFAULT_LEVEL_ELEM);
     if (def != null) {
-        this.default_level = def.getAttribute(GSXML.NAME_ATT);
+        this.default_level = def.getAttribute(GSXML.SHORTNAME_ATT);
     }
     if (this.default_level == null || this.default_level.equals("")) {

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

@@ -74 +74 @@
     // the default level is also the level which gdbm is expecting
     // this must not be overwritten
-    this.mgpp_src.setReturnLevel(this.default_level);
+    this.mgpp_src.setReturnLevel(this.default_gdbm_level);
     // return term info
     this.mgpp_src.setReturnTerms(true);