Changeset 26130 for main

Timestamp:

2012-08-27T16:38:59+12:00 (12 years ago)

Author:

ak19

Message:

custom indexSubcollection displayItems now show up in Form Search. This was also necessary in the enhanced Tudor tutorial, where search partitions are created and users are asked to provide custom displayNames for these.

File:

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

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

@@ -182 +182 @@
         {
             Document owner = info.getOwnerDocument();
-            // so far we have index specific display elements, and global format elements 
+            Element config_search = (Element) GSXML.getChildByTagName(extra_info, GSXML.SEARCH_ELEM);
+
+            // so far we have index and indexSubcollection specific display elements, and global format elements 
+
             NodeList indexes = info.getElementsByTagName(GSXML.INDEX_ELEM);
-            Element config_search = (Element) GSXML.getChildByTagName(extra_info, GSXML.SEARCH_ELEM);
-
             for (int i = 0; i < indexes.getLength(); i++)
             {
@@ -208 +209 @@
                 }
             } // for each index
+
+            NodeList indexSubcollections = info.getElementsByTagName(INDEX_SUBCOLLECTION_ELEM); // buildConfig.xml
+
+            for (int i = 0; i < indexSubcollections.getLength(); i++)
+            {
+                Element indexSubcollection = (Element) indexSubcollections.item(i);
+                String name = indexSubcollection.getAttribute(GSXML.NAME_ATT);
+                Element node_extra = GSXML.getNamedElement(config_search, INDEX_SUBCOLLECTION_ELEM, GSXML.NAME_ATT, name); // collectionConfig.xml
+                if (node_extra == null)
+                {
+                    logger.error("haven't found extra info for indexSubCollection 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);
+                        indexSubcollection.appendChild(owner.importNode(e, true));
+                    }
+                }
+            } // for each indexSubCollection
         }
         return true;