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

Timestamp:

2012-08-01T15:37:53+12:00 (12 years ago)

Author:

ak19

Message:

Need to trim the search types that get written out to the collectionConfig.xml file, else there can be extraneous whitespace in the form of a newline before the terminating quote, which causes the FieldQuery to not turn up in the ServiceList XML being read in by the Greenstone server code when the TextQuery is not also present.

File:

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

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

@@ -944 +944 @@
             }
         }
+        searchtype_str = searchtype_str.trim();
 
         // pretend its a format statement
@@ -1513 +1514 @@
             return;
         }
-        String searchtype_str = XMLTools.getNodeText(e);
+        String searchtype_str = XMLTools.getNodeText(e).trim();
         //Get the 'search' element from 'to'
         Element search = (Element) XMLTools.getChildByTagName(to.getDocumentElement(), StaticStrings.SEARCH_STR);