Changeset 29177 for main/trunk/gli

Timestamp:

2014-08-08T18:37:35+12:00 (10 years ago)

Author:

ak19

Message:

GLI now preserves the newly added (optional) option subelements of collectionConfig.xml's index element. This is only used for solr collections at present when the user hand-edits collectionConfig.xml and specifies the solr field type (option-name solrfieldtype) for an index other than the default text_en_splitting. E.g. type text_es for index allfields.

File:

• main/trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfigXMLReadWrite.java (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfigXMLReadWrite.java

@@ -266 +266 @@
             String index_str_display = index_str;//for creating collectionmetadata for this index 
 
+
+            String options_str = "";
+            NodeList option_children = e.getElementsByTagName(StaticStrings.OPTION_STR);
+            if(option_children != null) {
+               for (int j = 0; j < option_children.getLength(); j++) {
+                Element el = (Element) option_children.item(j);
+
+                String name_str = el.getAttribute(StaticStrings.NAME_ATTRIBUTE);
+                options_str = options_str + ((name_str.equals("")) ? "" : (" " + name_str));
+
+                String value_str = el.getAttribute(StaticStrings.VALUE_ATTRIBUTE);
+                options_str = options_str + ((name_str.equals("")) ? "" : (" " + value_str));
+
+                if (name_str.equals("") && !value_str.equals(""))
+                {
+                    continue; //invalid condition
+                }
+
+                Element option_element = null;
+                option_element = to.createElement(StaticStrings.OPTION_ELEMENT);
+                option_element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.TRUE_STR);
+
+                if (!name_str.equals(""))
+                {
+                    option_element.setAttribute(StaticStrings.NAME_ATTRIBUTE, name_str);
+                }
+                if (value_str != null && !value_str.equals(""))
+                {
+                    XMLTools.setNodeText(option_element, value_str);
+                }
+                index_element.appendChild(option_element);
+               }
+            }
+
             // Handling 'index' element
             // Double check to make sure it's not colon separated style index.
@@ -2007 +2041 @@
                     index_ele.appendChild(displayItem);
                 }
+            }
+
+            // deal with any <option name='' value=''> children of this index
+            // e.g. <option name='solrfieldtype' value='text_es'>
+            NodeList option_children = index_element.getElementsByTagName(StaticStrings.OPTION_ELEMENT);
+            for (int k = 0; k < option_children.getLength(); k++)
+            {
+                Element el = (Element) option_children.item(k);
+                if (el.getAttribute(StaticStrings.ASSIGNED_ATTRIBUTE).equals(StaticStrings.FALSE_STR))
+                {
+                    continue;
+                }
+                String name_str = el.getAttribute(StaticStrings.NAME_ATTRIBUTE);
+                String value_str = XMLTools.getNodeText(el);
+
+                if (name_str == null && value_str == null)
+                {
+                    continue;
+                }
+                Element option_element = to.createElement(StaticStrings.OPTION_STR);
+                if (!name_str.equals("")) {
+                    option_element.setAttribute(StaticStrings.NAME_ATTRIBUTE, name_str);
+                }
+                if (!value_str.equals("")) { // or no value attribute without name attribute?
+                    option_element.setAttribute(StaticStrings.VALUE_ATTRIBUTE, value_str);      
+                }
+                index_ele.appendChild(option_element);
             }