Changeset 36244 for main

Timestamp:

2022-06-07T10:27:36+12:00 (23 months ago)

Author:

kjdon

Message:

updating this for new searchmeta changes

File:

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

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

@@ -67 +67 @@
       return indexDefaultToString (command_element);
     }
+    else if(command_element_name.equals (StaticStrings.SORTS_ELEMENT)) {
+      return sortsToString (command_element);
+    }
+    else if(command_element_name.equals (StaticStrings.SORT_DEFAULT_ELEMENT)) {
+      return sortDefaultToString (command_element);
+    }
     else if(command_element_name.equals (StaticStrings.LANGUAGES_ELEMENT)) {
       return languagesToString (command_element);
@@ -256 +262 @@
     return text.toString ();
   }
-    
+     static private String sortsToString (Element command_element) {
+    boolean comment_only = false;
+    StringBuffer text = new StringBuffer ("");
+    if(command_element.getAttribute (StaticStrings.ASSIGNED_ATTRIBUTE).equals (StaticStrings.FALSE_STR)) {
+    System.err.println("sorts not assigned, returning false");
+    return "";
+    //  text.append ("#");
+    //comment_only = true;
+    }
+    text.append (StaticStrings.SORT_STR);
+    text.append (StaticStrings.TAB_CHARACTER);
+    //    if(!comment_only) { why???
+    //  text.append (StaticStrings.TAB_CHARACTER);
+    // }
+    NodeList index_elements = command_element.getElementsByTagName (StaticStrings.SORT_ELEMENT);
+    if (index_elements.getLength () == 0) { // no indexes
+      return "";
+    }
+    // For each sortfield,  concatenate its child content elements into a single comma separated list
+    int index_elements_length = index_elements.getLength ();
+    for(int j = 0; j < index_elements_length; j++) {
+      Element index_element = (Element) index_elements.item (j);
+      NodeList content_elements = index_element.getElementsByTagName (StaticStrings.CONTENT_ELEMENT);
+      int content_elements_length = content_elements.getLength ();
+      // Don't output anything if no indexes are set
+      if(content_elements_length == 0) {
+    return null;
+      }
+      for(int k = 0; k < content_elements_length; k++) {
+    Element content_element = (Element) content_elements.item (k);
+    String name_str = content_element.getAttribute (StaticStrings.NAME_ATTRIBUTE);
+    text.append (name_str);
+    name_str = null;
+    if(k < content_elements_length - 1) {
+      text.append (StaticStrings.COMMA_CHARACTER);
+    }
+    content_element = null;
+      }
+      if(j < index_elements_length - 1) {
+    text.append (StaticStrings.SPACE_CHARACTER);
+      }
+      content_elements = null;
+      index_element = null;
+    }
+    index_elements = null;
+    return text.toString ();
+  }
+    
+  static private String sortDefaultToString (Element command_element) {
+    StringBuffer text = new StringBuffer ("");
+    if(command_element.getAttribute (StaticStrings.ASSIGNED_ATTRIBUTE).equals (StaticStrings.FALSE_STR)) {
+    return "";
+    }
+    text.append (StaticStrings.SORT_DEFAULT_STR);
+    text.append (StaticStrings.TAB_CHARACTER);
+    NodeList content_elements = command_element.getElementsByTagName (StaticStrings.CONTENT_ELEMENT);
+    int content_elements_length = content_elements.getLength ();
+    for(int j = 0; j < content_elements_length; j++) {
+      Element content_element = (Element) content_elements.item (j);
+      String name_str = content_element.getAttribute (StaticStrings.NAME_ATTRIBUTE);
+      text.append (name_str);
+      name_str = null;
+      if(j < content_elements_length - 1) {
+    text.append (StaticStrings.COMMA_CHARACTER);
+      }
+      content_element = null;
+    }
+    content_elements = null;
+    return text.toString ();
+  }
+ 
   static private String languagesToString (Element command_element) {
     StringBuffer text = new StringBuffer (StaticStrings.LANGUAGES_STR);
@@ -560 +636 @@
         command_element = parseIndexDefault (command_str, document);
       }
+      if(command_element == null && command_type.equals (StaticStrings.SORT_STR)) {
+        command_element = parseSortfields (command_str, document);
+      }
+      if(command_element == null && command_type.equals (StaticStrings.SORT_DEFAULT_STR) ) {
+                        
+        command_element = parseSortfieldDefault (command_str, document);
+      }
       if(command_element == null && command_type.equals (StaticStrings.LANGUAGES_STR)) {
         command_element = parseLanguage (command_str, document);
@@ -873 +956 @@
   }
     
+  static private Element parseSortfields (String command_str, Document document) {
+    Element command_element = null;
+    try {
+      StringTokenizer tokenizer = new StringTokenizer (command_str);
+      String command = tokenizer.nextToken ();
+      command_element = document.createElement (StaticStrings.SORTS_ELEMENT);
+      command_element.setAttribute (StaticStrings.ASSIGNED_ATTRIBUTE,  StaticStrings.TRUE_STR);
+      command = null;
+      if(!tokenizer.hasMoreTokens ()) {
+                
+    // there are no sortfields
+    command_element.setAttribute (StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.FALSE_STR);
+    tokenizer = null;
+    return command_element;
+      }
+            
+      while(tokenizer.hasMoreTokens ()) {
+    Element index_element = document.createElement (StaticStrings.SORT_ELEMENT);
+    String index_str = tokenizer.nextToken ();
+    StringTokenizer content_tokenizer = new StringTokenizer (index_str, StaticStrings.COMMA_CHARACTER);
+    while(content_tokenizer.hasMoreTokens ()) {
+      Element content_element = document.createElement (StaticStrings.CONTENT_ELEMENT);
+      String content_str = content_tokenizer.nextToken ();
+      // Since the contents of indexes have to be certain keywords, or metadata elements, if the content isn't a keyword and doesn't yet have a namespace, append the extracted metadata namespace.
+      if(content_str.indexOf (StaticStrings.NS_SEP) == -1) {
+        if(content_str.equals (StaticStrings.RANK_STR) || content_str.equals (StaticStrings.NONE_STR) ) {
+          // Our special strings are OK.
+        }
+        else {
+          content_str = StaticStrings.EXTRACTED_NAMESPACE + content_str;
+        }
+      }
+      content_element.setAttribute (StaticStrings.NAME_ATTRIBUTE, content_str);
+      index_element.appendChild (content_element);
+      content_element = null;
+    }
+    content_tokenizer = null;
+    index_str = null;
+    command_element.appendChild (index_element);
+    index_element = null;
+      }
+      tokenizer = null;
+    }
+    catch (Exception exception) {
+      exception.printStackTrace ();
+    }
+    return command_element;
+  }
+
+  static private Element parseSortfieldDefault (String command_str, Document document) {
+    Element command_element = null;
+    try {
+      StringTokenizer tokenizer = new StringTokenizer (command_str);
+      if(tokenizer.countTokens () >= 2) {
+    command_element = document.createElement (StaticStrings.SORT_DEFAULT_ELEMENT);
+    command_element.setAttribute (StaticStrings.ASSIGNED_ATTRIBUTE, ((tokenizer.nextToken ()).equals (StaticStrings.SORT_DEFAULT_STR) ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
+    String index_str = tokenizer.nextToken ();
+                
+    String content_str = index_str;
+                
+                
+    StringTokenizer content_tokenizer = new StringTokenizer (content_str, StaticStrings.COMMA_CHARACTER);
+    while(content_tokenizer.hasMoreTokens ()) {
+      Element content_element = document.createElement (StaticStrings.CONTENT_ELEMENT);
+      content_element.setAttribute (StaticStrings.NAME_ATTRIBUTE, content_tokenizer.nextToken ());
+      command_element.appendChild (content_element);
+      content_element = null;
+    }
+    content_tokenizer = null;
+    content_str = null;
+    content_str = null;
+    index_str = null;
+      }
+      tokenizer = null;
+    }
+    catch (Exception exception) {
+    }
+    return command_element;
+  }
+
   static private Element parseLanguage (String command_str, Document document) {
     Element command_element = null;
@@ -982 +1145 @@
   static private Element parseMetadata (CommandTokenizer tokenizer, Document document) {
     Element command_element = null;
-    try {
-      command_element = document.createElement (StaticStrings.COLLECTIONMETADATA_ELEMENT);
+    boolean is_search_meta = false;
+    try {
+     
       String name_str = tokenizer.nextToken ();
+      if (name_str.startsWith(StaticStrings.DOT_CHARACTER)) {
+      is_search_meta = true;
+      name_str = name_str.substring(1); // remove the dot
+      }
       String value_str = tokenizer.nextToken ();
       if(name_str != null && value_str != null) {
@@ -995 +1163 @@
     if(value_str != null) {
       // Ready the value str (which can contain all sorts of funky characters) for writing as a DOM value
+        if (is_search_meta) {
+        command_element = document.createElement (StaticStrings.SEARCHMETADATA_ELEMENT);
+        command_element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, SearchMeta.TYPE_SEARCH);
+        } else {
+        command_element = document.createElement (StaticStrings.COLLECTIONMETADATA_ELEMENT);
+        }
       value_str = Codec.transform (value_str, Codec.GREENSTONE_TO_DOM);
       command_element.setAttribute (StaticStrings.NAME_ATTRIBUTE, name_str);