Changeset 13999 for trunk

Timestamp:

2007-04-02T12:29:05+12:00 (17 years ago)

Author:

qq6

Message:

add parameters:indexSubcollection, indexLanguage, defaultIndexSubcollection, defaultIndexLanguage, method: getIndexLanguageData(),getIndexSubcollectionData()

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractGS2Search.java (modified) (3 diffs)

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

@@ -53 +53 @@
     protected static final String INDEX_STEM_ELEM = "indexStem";
     protected static final String INDEX_ELEM = "index";
+    protected static final String DEFAULT_INDEX_SUBCOLLECTION_ELEM = "defaultIndexSubcollection";
+    protected static final String DEFAULT_INDEX_LANGUAGE_ELEM = "defaultIndexLanguage";
+    protected static final String INDEX_SUBCOLLECTION_ELEM = "indexSubcollection";
+    protected static final String INDEX_LANGUAGE_ELEM = "indexLanguage";
+   
 
     // Some indexing options
@@ -99 +104 @@
         this.default_index = def.getAttribute(GSXML.SHORTNAME_ATT);
     } // otherwise will be "", and the first one will be the default
+        
+        //get the default indexSubcollection out of <defaultIndexSubcollection> (buildConfig.xml)
+        Element defSub = (Element) GSXML.getChildByTagName(info, DEFAULT_INDEX_SUBCOLLECTION_ELEM); 
+    if (defSub != null) {
+        this.default_index_subcollection = defSub.getAttribute(GSXML.SHORTNAME_ATT);
+    } 
+
+    //get the default indexLanguage out of <defaultIndexLanguage> (buildConfig.xml)
+        Element defLang = (Element) GSXML.getChildByTagName(info, DEFAULT_INDEX_LANGUAGE_ELEM); 
+    if (defLang != null) {
+        this.default_index_language = defLang.getAttribute(GSXML.SHORTNAME_ATT);
+    } //concate defaultIndex + defaultIndexSubcollection + defaultIndexLanguage
+     
 
     // the index stem is either the collection name or is specified in the config file
@@ -199 +217 @@
         }
         index_names.add(display_name);
-        
-    }
-    
-    }
+    }   
+    }
+
+    protected void getIndexSubcollectionData(ArrayList index_sub_ids, ArrayList index_sub_names, String lang){
+    // the index info -
+    Element index_sub_list = (Element)GSXML.getChildByTagName(this.config_info, INDEX_SUBCOLLECTION_ELEM+GSXML.LIST_MODIFIER);
+    NodeList index_subs = index_sub_list.getElementsByTagName(INDEX_SUBCOLLECTION_ELEM);
+    int len = index_subs.getLength();
+    // now add even if there is only one
+    for (int i=0; i<len; i++) {
+        Element indexsub = (Element)index_subs.item(i);
+        String shortname = indexsub.getAttribute(GSXML.SHORTNAME_ATT);
+        if (shortname.equals("")) {
+        continue;
+        }
+        index_sub_ids.add(shortname);
+        String display_name = GSXML.getDisplayText(indexsub, GSXML.DISPLAY_TEXT_NAME, lang, "en");
+        if (display_name.equals("")) {
+        display_name = indexsub.getAttribute(GSXML.NAME_ATT);
+        if (display_name.equals("")) {
+            display_name = shortname;
+        }
+        }
+        index_sub_names.add(display_name);
+    }        
+     }
+      
+    protected void getIndexLanguageData(ArrayList index_lang_ids, ArrayList index_lang_names, String lang){
+    // the index info -
+    Element index_lang_list = (Element)GSXML.getChildByTagName(this.config_info, INDEX_LANGUAGE_ELEM+GSXML.LIST_MODIFIER);
+    NodeList index_langs = index_lang_list.getElementsByTagName(INDEX_LANGUAGE_ELEM);
+    int len = index_langs.getLength();
+    // now add even if there is only one
+    for (int i=0; i<len; i++) {
+        Element indexlang = (Element)index_langs.item(i);
+        String shortname = indexlang.getAttribute(GSXML.SHORTNAME_ATT);
+        if (shortname.equals("")) {
+        continue;
+        }
+        index_lang_ids.add(shortname);
+        String display_name = GSXML.getDisplayText(indexlang, GSXML.DISPLAY_TEXT_NAME, lang, "en");
+        if (display_name.equals("")) {
+        display_name = indexlang.getAttribute(GSXML.NAME_ATT);
+        if (display_name.equals("")) {
+            display_name = shortname;
+        }
+        }
+        index_lang_names.add(display_name);
+    }   
+    
+
+    }
+
 
     protected void addCustomQueryParams(Element param_list, String lang)