Changeset 12165

Timestamp:

2006-07-12T11:20:03+12:00 (18 years ago)

Author:

kjdon

Message:

added a hack to cope with pre 2.71 collections which don't specify a build type. if no build type specified, use mg unless searchtypes were specified, in which case use mgpp

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java (modified) (8 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

@@ -47 +47 @@
 import org.w3c.dom.*;
 
-/** This class provides either access to a pseudo-G3 document, or parses a collect.cfg file in such a way as to provide an xml-type view of its content. This later version is useful as it allows the manipulation and free form editing of a legacy collect.cfg file while still allowing the various CDM data managers to base themselves directly on this model (whereas they used to be independant ListModels which clobbered the ordering of unparsed commands).
+/** This class provides access to an xml-type view of the collect.cfg file. This is useful as it allows the manipulation and free form editing of a collect.cfg file while still allowing the various CDM data managers to base themselves directly on this model (whereas they used to be independant ListModels which clobbered the ordering of unparsed commands).
  * @author John Thompson, Greenstone Digital Library, University of Waikato
  * @version 2.3d
@@ -731 +731 @@
     static private String levelsToString(Element command_element) {
     StringBuffer text = new StringBuffer("");
-    if(!command_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(TRUE_STR)) {
+    if(command_element.getAttribute(ASSIGNED_ATTRIBUTE).equals(FALSE_STR)) {
         text.append("#");
     }
@@ -829 +829 @@
      * note we are ignoring 2.39 compatibility now. */
     private void parse(File collect_cfg_file) {
+    // hack for pre 2.71 compatibility - we need to add in a 
+    // build type if there is not one there
+    boolean search_types_parsed = false;
+    boolean build_types_parsed = false;
     try {
 
@@ -904 +908 @@
             if(command_element == null && (command_type.equals(COLLECTIONMETADATA_PUBLIC_STR) || command_type.equals(COLLECTIONMETADATA_CREATOR_STR) || command_type.equals(COLLECTIONMETADATA_MAINTAINER_STR) || command_type.equals(BUILDTYPE_STR))) {
             command_element = parseMetadataSpecial(command_str);
+            // pre 2.71 hack
+            if (command_type.equals(BUILDTYPE_STR)) {
+                build_types_parsed = true;
+            }
             }
             if(command_element == null && command_type.equals(PLUGIN_STR)) {
@@ -911 +919 @@
             if(command_element == null && command_type.equals(SEARCHTYPE_STR)) {
             command_element = parseSearchType(command_str);
+            // pre 2.71 hack
+            search_types_parsed = true;
+            
             }
             if(command_element == null && command_type.equals(SUBCOLLECTION_STR)) {
@@ -941 +952 @@
             //}
         }
-
+        if (!build_types_parsed) {
+        String buildtype_type = BuildTypeManager.BUILD_TYPE_MG;
+        if (search_types_parsed) {
+            buildtype_type = BuildTypeManager.BUILD_TYPE_MGPP;
+        }
+        Element command_element = parseMetadataSpecial(BUILDTYPE_STR+"  "+buildtype_type);
+        Node target_node = findInsertionPoint(command_element);
+        if(target_node != null) {
+            collect_cfg_element.insertBefore(command_element, target_node);
+        }
+        else {
+            collect_cfg_element.appendChild(command_element);
+        }
+
+        }
     }
     catch(Exception exception) {
@@ -949 +974 @@
     }
     
+ 
     private Element parseClassify(String command_str) {
     Element command_element = null;
@@ -1382 +1408 @@
         }
         value = Codec.transform(value, Codec.GREENSTONE_TO_DOM);
-        XMLTools.setValue(command_element, value);
-        
+        XMLTools.setValue(command_element, value);      
         }
     }