Changeset 33305

Timestamp:

2019-07-08T13:39:51+12:00 (5 years ago)

Author:

kjdon

Message:

get the list of level ids (= shortnames) and store it locally. This way solr search can use it to determine what cores it needs to load. (sidx/didx). so now in getLevelData, we already have level_ids, just need to get level_names.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java (modified) (7 diffs)

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

@@ -82 +82 @@
     protected String NOT_OPERATOR = "!";
 
+        // what levels we support
+        protected ArrayList<String> level_ids = null;
     // the default level for searching
     protected String default_level = null;
@@ -206 +208 @@
             }
 
+            // lets add displayinfo from collectionConfig into the level elements from buildConfig -
+            // so we can easily find them later.
+            // will also store a list of level ids so we can easily see which levels we have
             Document owner = info.getOwnerDocument();
 
+            level_ids = new ArrayList<String>();
             NodeList levels = info.getElementsByTagName(GSXML.LEVEL_ELEM);
-
+            
             for (int i = 0; i < levels.getLength(); i++)
-            {
-                Element lev = (Element) levels.item(i);
+              {
+                    Element lev = (Element) levels.item(i);
+                    String shortname = lev.getAttribute(GSXML.SHORTNAME_ATT);
+                if (shortname.equals(""))
+                  {
+                    continue;
+                  }
+                level_ids.add(shortname);
+                
                 String name = lev.getAttribute(GSXML.NAME_ATT);
                 Element node_extra = GSXML.getNamedElement(config_search, GSXML.LEVEL_ELEM, GSXML.NAME_ATT, name);
@@ -231 +244 @@
                     }
                 }
-            } // for each level
+              }// for each level
         }
         else
         {
-            // for soem reason we don't have the collectionConfig file. assume plain only
+            // for some reason we don't have the collectionConfig file. assume plain only
             this.plain_search = true;
         }
@@ -478 +491 @@
         if (name.equals(LEVEL_PARAM))
         {
-            ArrayList<String> level_ids = new ArrayList<String>();
             ArrayList<String> level_names = new ArrayList<String>();
-            getLevelData(level_ids, level_names, lang);
+            getLevelData(level_names, lang);
             if (level_ids.size() > 1)
             {
@@ -552 +564 @@
 
     // should cache some of this
-    protected void getLevelData(ArrayList<String> level_ids, ArrayList<String> level_names, String lang)
+  protected void getLevelData(ArrayList<String> level_names, String lang)
     {
         Element level_list = (Element) GSXML.getChildByTagName(this.config_info, LEVEL_ELEM + GSXML.LIST_MODIFIER);
-        NodeList levels = level_list.getElementsByTagName(LEVEL_ELEM);
-        for (int i = 0; i < levels.getLength(); i++)
-        {
-            Element level = (Element) levels.item(i);
-            String shortname = level.getAttribute(GSXML.SHORTNAME_ATT);
-            if (shortname.equals(""))
-            {
-                continue;
-            }
-            level_ids.add(shortname);
+        for (int i=0; i<level_ids.size(); i++) {
+          Element level = GSXML.getNamedElement(level_list, GSXML.LEVEL_ELEM, GSXML.SHORTNAME_ATT, level_ids.get(i));
             String display_name = getDisplayText(level, GSXML.DISPLAY_TEXT_NAME, lang, "en");
             if (display_name.equals(""))
@@ -572 +576 @@
                 if (display_name.equals(""))
                 {
-                    display_name = shortname;
+                  display_name = level_ids.get(i); // shortname
                 }
                 else
@@ -582 +586 @@
         }
     }
+
 
     // the following three functions are needed so the base class can