Changeset 26016 for main/trunk/gli/src

Timestamp:

2012-07-24T14:39:35+12:00 (12 years ago)

Author:

kjdon

Message:

added code to look for and display a top level format element - called 'global' in GLI

Location:

main/trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• CollectionConfigXMLReadWrite.java (modified) (4 diffs)
• Format4gs3Manager.java (modified) (3 diffs)

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

@@ -349 +349 @@
 
     }
-
+  static private void doGlobalFormat(Document to, Element from)
+  {
+    // look for a top level format element
+    Element fe = (Element) XMLTools.getChildByTagName(from, StaticStrings.FORMAT_STR);
+    to.getDocumentElement().appendChild(doFormat(to, fe, StaticStrings.GLOBAL_STR));
+  }
     static private void doDisplayFormat(Document to, Element from)
     {
@@ -1387 +1392 @@
     }
 
+  // convert global format statement
+    static private void convertGlobalFormat(Document from, Document to)
+    {
+      Element e = XMLTools.getNamedElement(from.getDocumentElement(), StaticStrings.FORMAT_STR, StaticStrings.NAME_ATTRIBUTE, StaticStrings.GLOBAL_STR);
+
+    to.getDocumentElement().appendChild(convertFormat(to, e));
+
+    }
+  
     // Convert plugins in the internal(i.e. Document from) to collectionconfig.xml (i.e. Document to)
     static private void convertPlugin(Document from, Document to)
@@ -2361 +2375 @@
         doSearchType(dOc, searchNode);
         doSearchFormat(dOc, searchNode);
+        doGlobalFormat(dOc, fromElement);
         doDisplayFormat(dOc, fromElement);
         doReplaceListRef(dOc, fromElement);
@@ -2433 +2448 @@
         convertMetadataList(dOc, skeleton);
         convertDisplayItemList(dOc, skeleton);
+        convertGlobalFormat(dOc, skeleton);
         convertBuildType(dOc, skeleton);
         convertDatabaseType(dOc, skeleton);

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

@@ -63 +63 @@
 public class Format4gs3Manager implements SharedByTwoFormatManager
 {
+
+  // The default global format
+  static final private String GLOBAL_FORMAT = "";
+  static final private String GLOBAL = "global";
     //The default search format
     static final private String SEARCH_FORMAT;
@@ -169 +173 @@
     static final private String SEARCHTYPE_FORMAT = "plain,simpleform,advancedform";
     static final private String SEARCHTYPE = "searchType";
-    static final private String[] FEATURE_NAME = { SEARCH, DISPLAY, CLASSIFIER_DEFAULT, SEARCHTYPE };
-    static final private String[] FEATURE_FORMAT = { SEARCH_FORMAT, DISPLAY_FORMAT, CLASSIFIER_DEFAULT_FORMAT, SEARCHTYPE_FORMAT };
+  static final private String[] FEATURE_NAME = { GLOBAL, SEARCH, DISPLAY, CLASSIFIER_DEFAULT, SEARCHTYPE };
+  static final private String[] FEATURE_FORMAT = { GLOBAL_FORMAT, SEARCH_FORMAT, DISPLAY_FORMAT, CLASSIFIER_DEFAULT_FORMAT, SEARCHTYPE_FORMAT };
 
     static private HashMap default_format_map = null;
@@ -346 +350 @@
     private String removeSurrondingTags(String xml)
     {
-        return xml.replace("<ROOTELEMENT>\n", "").replace("<ROOTELEMENT>", "").replace("</ROOTELEMENT>", "");
+      return xml.replace("<ROOTELEMENT>\n", "").replace("<ROOTELEMENT>", "").replace("</ROOTELEMENT>", "").replace("<ROOTELEMENT/>","");
     }