Changeset 36241 for main/trunk

Timestamp:

2022-06-07T10:05:30+12:00 (23 months ago)

Author:

kjdon

Message:

removed commented out code. for gs2, the collect.cfg has no way to differentiate between a text string for eg Date index and Date sortfield. (all are collectionmeta .Title titles) So. give them all the same type (search) and the existing code will handle not having duplicates - don't want the user to add a string for index:title and for sort:title. so now just has one opportunity, in search:title

File:

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

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

@@ -44 +44 @@
   public static final String TYPE_SORT = "sort";
   public static final String TYPE_FACET = "facet";
+
+    // gs2 all meta have the same type, as there is currently no distinction in
+    // config file
+    public static final String TYPE_SEARCH = "search";
  
     //    public SearchMeta() {
@@ -51 +55 @@
      */
     public SearchMeta(Element element) {
-    System.err.println("new search meta, elem = ");
-    System.err.println(XMLTools.xmlNodeToString(element));
     this.element = element;
     }
@@ -62 +64 @@
     public SearchMeta(String name, String type) {
     this(name, type, Configuration.getLanguage());
-    // element = CollectionConfiguration.createElement(StaticStrings.SEARCHMETADATA_ELEMENT);
-    // element.setAttribute(StaticStrings.NAME_ATTRIBUTE, name);
-    // element.setAttribute(StaticStrings.LANGUAGE_ATTRIBUTE, Configuration.getLanguage());
-    // element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.FALSE_STR);
-    // element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, type);
     }
 
@@ -75 +72 @@
     element.setAttribute(StaticStrings.LANGUAGE_ATTRIBUTE, language);
     element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.FALSE_STR);
-    element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, type);
+    if (Gatherer.GS3) {
+        element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, type);
+    } else {
+        element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, TYPE_SEARCH);
+    }
     }
 
@@ -104 +105 @@
      */
     public boolean equals(Object object) {
-      // System.err.println("running search meta equals");
-      //   if (object instanceof SearchMeta) {
-      //       if (compareTo(object) == 0 && getType().equals(((SearchMeta)object).getType())) {
-      //    return true;
-      //       }
-      //   }
-      //   return false;
     return (compareTo(object) == 0);
      }
 
-    // public Element getElement() {
-    //  return element;
-    // }
-
-    // /** Method to retrieve the value of language.
-    //  * @return the value of language as a <strong>String</strong>.
-    //  */
-    // public String getLanguage() {
-    //  // Retrieve the language string
-    //  return element.getAttribute(StaticStrings.LANGUAGE_ATTRIBUTE);
-    // }
-
-    // /** Method to retrieve the value of name.
-    //  * @return the name attribute of the collection meta as a String 
-    //  */
-    // public String getName() {
-    //  return element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
-    // }
-    // /** Method to retrieve the value of value (well great choice of name there).
-    //  * @return The value of value as a <strong>String</strong>.
-    //  */
-    // public String getValue(boolean text_value) {
-    //  String raw_value = XMLTools.getValue(element);
-    //  // Decode the raw value depending on whether the user asked for the TEXT or GREENSTONE version
-    //  if(text_value == TEXT) {
-    //      return Codec.transform(raw_value, Codec.DOM_TO_TEXT);
-    //  }
-    //  else {
-    //      return Codec.transform(raw_value, Codec.DOM_TO_GREENSTONE);
-    //  }
-    // }
-
-    // public boolean isAssigned() {
-    //  return (element != null && !element.getAttribute(StaticStrings.ASSIGNED_ATTRIBUTE).equals(StaticStrings.FALSE_STR));
-    // }
-
-    // public boolean isDummy() {
-    //  return dummy;
-    // }
-
-    // /** Determine if this metadata is one of the four special pieces of metadata.
-    //  * @return true if this metadata is special, false otherwise.
-    //  */
-    // public boolean isSpecial() {
-    //  return (element != null && element.getAttribute(StaticStrings.SPECIAL_ATTRIBUTE).equals(StaticStrings.TRUE_STR));
-    // }
-
-    // public void setAssigned(boolean assigned) {
-    //  if(element != null) {
-    //      element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, (assigned ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
-    //  }
-    // }
-
-    // public void setElement(Element element) {
-    //  this.element = element;
-    //  text = null;
-    // }
-
-    // /** Change the value of value. 
-    //  * @param raw_value the new value as a String.
-    //  */
-    // public void setValue(String raw_value) {
-    //  setValue(raw_value, false);
-    // }
-
-    // public void setValue(String raw_value, boolean preserveTags) {
-    //  // we need to check if the value has changed
-    //  String current_value = XMLTools.getValue(element);
-    
-    //  String new_value = preserveTags ?
-    //      Codec.transform(raw_value, Codec.TEXT_TO_DOM_PRESERVE_TAGS)
-    //      : Codec.transform(raw_value, Codec.TEXT_TO_DOM);
-    //  if (!current_value.equals(new_value)) {
-    //      // Only raw html text can be given to setValue so we need to encode it
-    //      XMLTools.setValue(element, new_value);
-    //      text = null; // Reset text
-    //      // And determine if this makes the metadata assigned
-    //      setAssigned(raw_value != null && raw_value.length() > 0);
-    //  }
-    // }
 
   public void setType(String type) {
     if(element != null) {
-      element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, type);
+    if (Gatherer.GS3) {
+        element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, type);
+    } else {
+        element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, TYPE_SEARCH);
+    }
     }
   }
     public String getType() {
     if (element != null) {
+
         return element.getAttribute(StaticStrings.TYPE_ATTRIBUTE);
     }