Changeset 7457

Timestamp:

2004-05-27T12:03:43+12:00 (20 years ago)

Author:

mdewsnip

Message:

Now ignores the beta collection configuration option altogether, to prevent weird bugs where either a beta option is written repeatedly to the file with no value, or the beta value is deleted from the file.

File:

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

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

@@ -239 +239 @@
         return self.metadataToString(command_element, show_extracted_namespace);
     }
-    else if(command_element_name.equals(COLLECTIONMETADATA_BETA_ELEMENT)) {
-        return self.metadataToString(command_element, show_extracted_namespace);
-    }
+    // else if(command_element_name.equals(COLLECTIONMETADATA_BETA_ELEMENT)) {
+    //     return self.metadataToString(command_element, show_extracted_namespace);
+    // }
     else if(command_element_name.equals(PLUGIN_ELEMENT)) {
         return self.pluginToString(command_element, show_extracted_namespace);
@@ -308 +308 @@
     static final private String EXTRACTED_PREFIX = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP;
     /** Gives the preferred ordering of commands */
-    static final private String[] COMMAND_ORDER = {StaticStrings.COLLECTIONMETADATA_CREATOR_ELEMENT, StaticStrings.COLLECTIONMETADATA_MAINTAINER_ELEMENT, StaticStrings.COLLECTIONMETADATA_PUBLIC_ELEMENT, StaticStrings.COLLECTIONMETADATA_BETA_ELEMENT, StaticStrings.SEARCHTYPE_ELEMENT, StaticStrings.PLUGIN_ELEMENT, StaticStrings.INDEXES_ELEMENT, StaticStrings.LEVELS_ELEMENT, StaticStrings.INDEX_DEFAULT_ELEMENT, StaticStrings.LANGUAGES_ELEMENT, StaticStrings.LANGUAGE_DEFAULT_ELEMENT, StaticStrings.SUBCOLLECTION_ELEMENT, StaticStrings.SUBCOLLECTION_INDEXES_ELEMENT, StaticStrings.SUBCOLLECTION_DEFAULT_INDEX_ELEMENT, StaticStrings.SUPERCOLLECTION_ELEMENT, StaticStrings.CLASSIFY_ELEMENT, StaticStrings.FORMAT_ELEMENT, StaticStrings.COLLECTIONMETADATA_ELEMENT};
+    static final private String[] COMMAND_ORDER = {StaticStrings.COLLECTIONMETADATA_CREATOR_ELEMENT, StaticStrings.COLLECTIONMETADATA_MAINTAINER_ELEMENT, StaticStrings.COLLECTIONMETADATA_PUBLIC_ELEMENT, /* StaticStrings.COLLECTIONMETADATA_BETA_ELEMENT, */ StaticStrings.SEARCHTYPE_ELEMENT, StaticStrings.PLUGIN_ELEMENT, StaticStrings.INDEXES_ELEMENT, StaticStrings.LEVELS_ELEMENT, StaticStrings.INDEX_DEFAULT_ELEMENT, StaticStrings.LANGUAGES_ELEMENT, StaticStrings.LANGUAGE_DEFAULT_ELEMENT, StaticStrings.SUBCOLLECTION_ELEMENT, StaticStrings.SUBCOLLECTION_INDEXES_ELEMENT, StaticStrings.SUBCOLLECTION_DEFAULT_INDEX_ELEMENT, StaticStrings.SUPERCOLLECTION_ELEMENT, StaticStrings.CLASSIFY_ELEMENT, StaticStrings.FORMAT_ELEMENT, StaticStrings.COLLECTIONMETADATA_ELEMENT};
 
     /** ************************** Public Data Members ***************************/
@@ -355 +355 @@
     dialog.show();
     }
-    
-    public Element getBeta() {
-    Element element = getOrCreateElementByTagName(COLLECTIONMETADATA_BETA_ELEMENT, null, null);
-    element.setAttribute(NAME_ATTRIBUTE, COLLECTIONMETADATA_BETA_STR);
-    element.setAttribute(SPECIAL_ATTRIBUTE, TRUE_STR);
-    return element;
-    }
+
+//      public Element getBeta() {
+//      Element element = getOrCreateElementByTagName(COLLECTIONMETADATA_BETA_ELEMENT, null, null);
+//      element.setAttribute(NAME_ATTRIBUTE, COLLECTIONMETADATA_BETA_STR);
+//      element.setAttribute(SPECIAL_ATTRIBUTE, TRUE_STR);
+//      return element;
+//      }
 
     public Element getCreator() {
@@ -758 +758 @@
         special = true;
     }
-    else if(name_str.equals(COLLECTIONMETADATA_BETA_STR) || name_str.equals(COLLECTIONMETADATA_CREATOR_STR) || name_str.equals(COLLECTIONMETADATA_PUBLIC_STR)) {
+    else if (/* name_str.equals(COLLECTIONMETADATA_BETA_STR) || */ name_str.equals(COLLECTIONMETADATA_CREATOR_STR) || name_str.equals(COLLECTIONMETADATA_PUBLIC_STR)) {
         text.append(name_str);
         text.append(TAB_CHARACTER);
@@ -987 +987 @@
             command_element = parseMetadata(tokenizer); // Revised to handle multiple lines
             }
-            if(command_element == null && (command_type.equals(COLLECTIONMETADATA_BETA_STR) || command_type.equals(COLLECTIONMETADATA_PUBLIC_STR) || command_type.equals(COLLECTIONMETADATA_CREATOR_STR) || command_type.equals(COLLECTIONMETADATA_MAINTAINER_STR))) {
+            if(command_element == null && (/* command_type.equals(COLLECTIONMETADATA_BETA_STR) || */ command_type.equals(COLLECTIONMETADATA_PUBLIC_STR) || command_type.equals(COLLECTIONMETADATA_CREATOR_STR) || command_type.equals(COLLECTIONMETADATA_MAINTAINER_STR))) {
             command_element = parseMetadataSpecial(command_str);
             }
@@ -1378 +1378 @@
         String name_str = tokenizer.nextToken();
         String value_str = tokenizer.nextToken();
-        if(name_str.equals(COLLECTIONMETADATA_BETA_STR)) {
-            command_element = document.createElement(COLLECTIONMETADATA_BETA_ELEMENT);
-        }
-        else if(name_str.equals(COLLECTIONMETADATA_CREATOR_STR)) {
+        // if(name_str.equals(COLLECTIONMETADATA_BETA_STR)) {
+        //     command_element = document.createElement(COLLECTIONMETADATA_BETA_ELEMENT);
+        // }
+        if (name_str.equals(COLLECTIONMETADATA_CREATOR_STR)) {
             command_element = document.createElement(COLLECTIONMETADATA_CREATOR_ELEMENT);
         }