Changeset 12350

Timestamp:

2006-07-31T13:49:47+12:00 (18 years ago)

Author:

kjdon

Message:

change parseClassify to use a StringBuffer in an inner loop, and added support for languagemetadata in collect.cfg (used with language partitions

File:

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

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

@@ -216 +216 @@
         return languageDefaultToString(command_element);
     }
+    else if (command_element_name.equals(LANGUAGE_METADATA_ELEMENT)) {
+        return languageMetadataToString(command_element, show_extracted_namespace);
+    }
     else if(command_element_name.equals(LEVELS_ELEMENT)) {
         return levelsToString(command_element);
@@ -300 +303 @@
 
     /** 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.SEARCHTYPE_ELEMENT,*/ StaticStrings.BUILDTYPE_ELEMENT, StaticStrings.PLUGIN_ELEMENT, StaticStrings.INDEXES_ELEMENT, StaticStrings.INDEX_DEFAULT_ELEMENT, StaticStrings.LEVELS_ELEMENT, StaticStrings.LEVEL_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.BUILDTYPE_ELEMENT, StaticStrings.PLUGIN_ELEMENT, StaticStrings.INDEXES_ELEMENT, StaticStrings.INDEX_DEFAULT_ELEMENT, StaticStrings.LEVELS_ELEMENT, StaticStrings.LEVEL_DEFAULT_ELEMENT, StaticStrings.LANGUAGES_ELEMENT, StaticStrings.LANGUAGE_DEFAULT_ELEMENT, StaticStrings.LANGUAGE_METADATA_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 ***************************/
@@ -359 +362 @@
     }
 
+    public Element getLanguageMetadata() {
+    return getOrCreateElementByTagName(LANGUAGE_METADATA_ELEMENT, null, null);
+    }
+    
     public Element getLevels() {
     return getOrCreateElementByTagName(LEVELS_ELEMENT, null, null);
@@ -393 +400 @@
 
     }
-//     /** Retrieve or create the searchtype element. */
-//     public Element getSearchType() {
-//  ///ystem.err.println("Get or create element by tag name: " + name);
-//  Element document_element = document.getDocumentElement();
-//  NodeList elements = document_element.getElementsByTagName(SEARCHTYPE_ELEMENT);
-//  int elements_length = elements.getLength();
-//  if(elements_length > 0) {
-//      document_element = null;
-//      return (Element) elements.item(0);
-//  }
-//  // Create the element
-//  Element element = document.createElement(SEARCHTYPE_ELEMENT);
-//  Node target_node = findInsertionPoint(element);
-//  if(target_node != null) {
-//      document_element.insertBefore(element, target_node);
-//  }
-//  else {
-//      document_element.appendChild(element);
-//  }
-//  document_element = null;
-//  // Append a default search type node - form
-//  Element a_searchtype_element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.CONTENT_ELEMENT);
-//  a_searchtype_element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, SearchTypeManager.SEARCH_TYPES[0]);
-//  element.appendChild(a_searchtype_element);
-//  return element;
-//     }
 
     /** Retrieve or create the subindexes Element. */
@@ -511 +492 @@
         text.append(option_element.getAttribute(NAME_ATTRIBUTE));
         String value_str = XMLTools.getValue(option_element);
-
+        StringBuffer value_buffer = new StringBuffer();
         // Remove the extracted metadata namespaces if required
         if (value_str.length() > 0) {
             StringTokenizer string_tokenizer = new StringTokenizer(value_str, ",");
-            value_str = "";
             while (string_tokenizer.hasMoreElements()) {
             String raw_token = (String) string_tokenizer.nextElement();
@@ -527 +507 @@
                 token = token.substring(StaticStrings.EXTRACTED_NAMESPACE.length());
             }
-
-            value_str = value_str + token;
+            value_buffer.append(token);
             if (string_tokenizer.hasMoreElements()) {
-                value_str = value_str + ",";
+                value_buffer.append(",");
             }
             }
@@ -537 +516 @@
         text.append(SPACE_CHARACTER);
         if (value_str.indexOf(SPACE_CHARACTER) == -1) {
-            text.append(value_str);
+            text.append(value_buffer.toString());
         }
         else {
@@ -729 +708 @@
     }
 
+    static private String languageMetadataToString(Element command_element, boolean show_extracted_namespace) {
+    StringBuffer text = new StringBuffer(LANGUAGE_METADATA_STR);
+    text.append(TAB_CHARACTER);
+    String name_str = command_element.getAttribute(NAME_ATTRIBUTE);
+    if(!show_extracted_namespace && name_str.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) {
+        name_str = name_str.substring(StaticStrings.EXTRACTED_NAMESPACE.length());
+    }
+    text.append(name_str);
+    return text.toString();
+    }
+    
     static private String levelsToString(Element command_element) {
     StringBuffer text = new StringBuffer("");
@@ -894 +884 @@
             if(command_element == null && command_type.equals(LANGUAGE_DEFAULT_STR)) {
             command_element = parseLanguageDefault(command_str);
+            }
+            if (command_element == null && command_type.equals(LANGUAGE_METADATA_STR)) {
+            command_element = parseLanguageMetadata(command_str);
             }
             if(command_element == null && (command_type.equals(LEVELS_STR) || command_type.equals(COMMENTED_LEVELS_STR))) {
@@ -1206 +1199 @@
     }
 
+    private Element parseLanguageMetadata(String command_str) {
+    Element command_element = null;
+    try {
+        StringTokenizer tokenizer = new StringTokenizer(command_str);
+        if(tokenizer.countTokens() >= 2) {
+        command_element = document.createElement(LANGUAGE_METADATA_ELEMENT);
+        tokenizer.nextToken();
+        String language_metadata_str = tokenizer.nextToken();
+        if (language_metadata_str.indexOf(StaticStrings.NS_SEP) == -1) {
+            language_metadata_str = StaticStrings.EXTRACTED_NAMESPACE + language_metadata_str;
+        }
+        command_element.setAttribute(NAME_ATTRIBUTE, language_metadata_str);
+        command_element.setAttribute(ASSIGNED_ATTRIBUTE, StaticStrings.TRUE_STR);
+        language_metadata_str = null;
+        }
+        tokenizer = null;
+        
+    }
+    catch (Exception exception) {
+    }
+    return command_element;
+    }
+    
     private Element parseLevels(String command_str) {
     Element command_element = null;