Changeset 24367 for main/trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfigXMLReadWrite.java

Timestamp:

2011-08-04T21:12:12+12:00 (13 years ago)

Author:

ak19

Message:

Changes to GLI to do with embedded metadata: the plugin and changes to the processing of ex.metadata to deal with ex.something.metadata

File:

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

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

@@ -1138 +1138 @@
       value_str = "";
       for (int k=0; k<=values.length-1; k++) {
-        if(values[k].startsWith (StaticStrings.EXTRACTED_NAMESPACE)) {
+        if(values[k].startsWith (StaticStrings.EXTRACTED_NAMESPACE) && values[k].indexOf(StaticStrings.NS_SEP, StaticStrings.EXTRACTED_NAMESPACE.length()) == -1) {
           values[k] = values[k].substring (StaticStrings.EXTRACTED_NAMESPACE.length ());
         }
@@ -1253 +1253 @@
     if (name_str != null && name_str.equals (StaticStrings.METADATA_STR)) {
                     
-      // The metadata argument is the fully qualified name of a metadata element, so if it contains a namespace, remove the extracted metadata namespace as the build process doesn't know about it.
+      // The metadata argument is the fully qualified name of a metadata element, so if it contains a namespace, remove the extracted metadata namespace as the build process doesn't know about it, but ONLY if it is not embedded metadata (e.g. ex.dc.*)
       String[] values = value_str.split (StaticStrings.COMMA_CHARACTER);
       value_str = "";
       for (int k=0; k<=values.length-1; k++) {
-        if(values[k].startsWith (StaticStrings.EXTRACTED_NAMESPACE)) {
+        if(values[k].startsWith (StaticStrings.EXTRACTED_NAMESPACE) && values[k].indexOf(StaticStrings.NS_SEP, StaticStrings.EXTRACTED_NAMESPACE.length()) == -1) {
           values[k] = values[k].substring (StaticStrings.EXTRACTED_NAMESPACE.length ());
         }
@@ -1383 +1383 @@
       String name_str = content_element.getAttribute (StaticStrings.NAME_ATTRIBUTE);
             
-      if(name_str.startsWith (StaticStrings.EXTRACTED_NAMESPACE)) {
+      if(name_str.startsWith (StaticStrings.EXTRACTED_NAMESPACE) && name_str.indexOf(StaticStrings.NS_SEP, StaticStrings.EXTRACTED_NAMESPACE.length()) == -1) {
     name_str = name_str.substring (StaticStrings.EXTRACTED_NAMESPACE.length ());
       }
@@ -1435 +1435 @@
       }
             
-      if(content.startsWith (StaticStrings.EXTRACTED_NAMESPACE)) {
+      if(content.startsWith (StaticStrings.EXTRACTED_NAMESPACE) && content.indexOf(StaticStrings.NS_SEP, StaticStrings.EXTRACTED_NAMESPACE.length()) == -1) {
     content = content.substring (StaticStrings.EXTRACTED_NAMESPACE.length ());
       }
@@ -1584 +1584 @@
       String meta_name = language_metadata.getAttribute (StaticStrings.NAME_ATTRIBUTE);
       Element language_meta = to.createElement (StaticStrings.LANGUAGE_METADATA_ELEMENT_STR);
-      if(meta_name.startsWith (StaticStrings.EXTRACTED_NAMESPACE)) {
+      if(meta_name.startsWith (StaticStrings.EXTRACTED_NAMESPACE) && meta_name.indexOf(StaticStrings.NS_SEP, StaticStrings.EXTRACTED_NAMESPACE.length()) == -1) {
     meta_name = meta_name.substring (StaticStrings.EXTRACTED_NAMESPACE.length ());
       }
@@ -1664 +1664 @@
     }
                 
-    if(name_str.startsWith (StaticStrings.EXTRACTED_NAMESPACE)) {
+    if(name_str.startsWith (StaticStrings.EXTRACTED_NAMESPACE) && name_str.indexOf(StaticStrings.NS_SEP, StaticStrings.EXTRACTED_NAMESPACE.length()) == -1) {
       name_str = name_str.substring (StaticStrings.EXTRACTED_NAMESPACE.length ());
     }