Changeset 14000

Timestamp:

2007-04-02T12:30:26+12:00 (17 years ago)

Author:

qq6

Message:

add parameters:defaultIndexSubcollection, defaultIndexLanguage

File:

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

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

@@ -43 +43 @@
     private static final String INDEX_LIST_ELEM = "indexList";
     private static final String INDEX_ELEM = "index";
-
+    private static final String DEFAULT_INDEX_SUBCOLLECTION_ELEM = "defaultIndexSubcollection";
+    private static final String DEFAULT_INDEX_LANGUAGE_ELEM = "defaultIndexLanguage";
+  
     private MGWrapper mg_src = null;
     private String mg_basedir = null;
@@ -74 +76 @@
         this.default_index = def.getAttribute(GSXML.SHORTNAME_ATT);
     }
+         Element defSub = (Element) GSXML.getChildByTagName(info, DEFAULT_INDEX_SUBCOLLECTION_ELEM); 
+    if (defSub != null) {
+        this.default_index += defSub.getAttribute(GSXML.SHORTNAME_ATT);
+        logger.info("default indexSubcollection is "+defSub.getAttribute(GSXML.SHORTNAME_ATT));      
+    } //concate defaultIndex + defaultIndexSubcollection
+
+    //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 += defLang.getAttribute(GSXML.SHORTNAME_ATT);
+            logger.info("default indexLanguage is "+defLang.getAttribute(GSXML.SHORTNAME_ATT)); 
+    } //concate defaultIndex + defaultIndexSubcollection + defaultIndexLanguage
+     
+
     if (this.default_index == null || this.default_index.equals("")) {
              logger.error("default index is not specified, the content of a document will not be retrieved");
@@ -107 +123 @@
     String doc_content = null;
 
+        //means that this.mg_src is up and running  
     if (has_default_index ){
             doc_content =  this.mg_src.getDocument(this.mg_basedir,