Changeset 23394

Timestamp:

2010-12-07T14:27:04+13:00 (13 years ago)

Author:

kjdon

Message:

added support for specifying accumulating=false in metadata set definition. GLI then won't allow user to add multiple values for that element.

Location:

main/trunk/gli/src/org/greenstone/gatherer/metadata

Files:

• MetadataElement.java (modified) (3 diffs)
• MetadataValue.java (modified) (3 diffs)
• MetadataXMLFile.java (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/metadata/MetadataElement.java

@@ -46 +46 @@
     /* This restricts the user to only the predefined values */
     private boolean restricted_values = false;
-
+  /* can we have more than one value for this metadata element per document? */
+  /* default, true = yes */
+  private boolean accumulating = true;
     public MetadataElement(String metadata_element_name_full, Element metadata_element_element)
     {
@@ -61 +63 @@
         }
         }
+        if (metadata_element_element.getAttribute("accumulating").equals("false")) {
+          accumulating = false;
+        }
     }
     }
@@ -204 +209 @@
     }
 
+  public boolean isAccumulating() {
+    return accumulating;
+  }
     public boolean isSubelement()
     {

main/trunk/gli/src/org/greenstone/gatherer/metadata/MetadataValue.java

@@ -39 +39 @@
     private MetadataElement metadata_element = null;
     private MetadataValueTreeNode metadata_value_tree_node = null;
+  // this will be set to true if the metadata element definition says accumulating = false.
+  private boolean must_not_accumulate = false;
     private boolean is_accumulating_metadata = false;
     /** Whether this metadata applies to only one file (ie. there are no wildcards in the FileSet value) */
@@ -48 +50 @@
     this.metadata_element = metadata_element;
     this.metadata_value_tree_node = metadata_value_tree_node;
+    if (metadata_element != null) {
+      if (!metadata_element.isAccumulating()) {
+        must_not_accumulate = true;
+      }
+    }
     }
 
@@ -122 +129 @@
     public void setIsAccumulatingMetadata(boolean is_accumulating_metadata)
     {
+      if (!must_not_accumulate) {
     this.is_accumulating_metadata = is_accumulating_metadata;
+      } 
     }
 

main/trunk/gli/src/org/greenstone/gatherer/metadata/MetadataXMLFile.java

@@ -127 +127 @@
         appropriate_fileset_element.appendChild(new_description_element);
 
-        loaded_file_document.getDocumentElement().appendChild(appropriate_fileset_element);
+        if(file_path_regexp.equals(DIRECTORY_FILENAME)) {
+          loaded_file_document.getDocumentElement().insertBefore(appropriate_fileset_element, loaded_file_document.getDocumentElement().getFirstChild());
+        } else {
+          loaded_file_document.getDocumentElement().appendChild(appropriate_fileset_element);
+        }
     }
 
@@ -152 +156 @@
         String current_metadata_element_name_full = current_metadata_element.getAttribute("name");
         if (current_metadata_element_name_full.equals(metadata_element_name_full)) {
+          // if the metadata must not accumulate, then edit teh current value
+          if (!metadata_value.isAccumulatingMetadata()) {
+            XMLTools.setNodeText(current_metadata_element, metadata_value_string);
+            metadata_already_assigned = true;
+            break;
+          }
             // Check if the metadata element value matches
             String current_metadata_value_string = XMLTools.getElementTextValue(current_metadata_element);