- Timestamp:
- 2011-08-04T21:12:12+12:00 (13 years ago)
- Location:
- main/trunk/gli/src/org/greenstone/gatherer
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfigXMLReadWrite.java
r23680 r24367 1138 1138 value_str = ""; 1139 1139 for (int k=0; k<=values.length-1; k++) { 1140 if(values[k].startsWith (StaticStrings.EXTRACTED_NAMESPACE) ) {1140 if(values[k].startsWith (StaticStrings.EXTRACTED_NAMESPACE) && values[k].indexOf(StaticStrings.NS_SEP, StaticStrings.EXTRACTED_NAMESPACE.length()) == -1) { 1141 1141 values[k] = values[k].substring (StaticStrings.EXTRACTED_NAMESPACE.length ()); 1142 1142 } … … 1253 1253 if (name_str != null && name_str.equals (StaticStrings.METADATA_STR)) { 1254 1254 1255 // 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 .1255 // 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.*) 1256 1256 String[] values = value_str.split (StaticStrings.COMMA_CHARACTER); 1257 1257 value_str = ""; 1258 1258 for (int k=0; k<=values.length-1; k++) { 1259 if(values[k].startsWith (StaticStrings.EXTRACTED_NAMESPACE) ) {1259 if(values[k].startsWith (StaticStrings.EXTRACTED_NAMESPACE) && values[k].indexOf(StaticStrings.NS_SEP, StaticStrings.EXTRACTED_NAMESPACE.length()) == -1) { 1260 1260 values[k] = values[k].substring (StaticStrings.EXTRACTED_NAMESPACE.length ()); 1261 1261 } … … 1383 1383 String name_str = content_element.getAttribute (StaticStrings.NAME_ATTRIBUTE); 1384 1384 1385 if(name_str.startsWith (StaticStrings.EXTRACTED_NAMESPACE) ) {1385 if(name_str.startsWith (StaticStrings.EXTRACTED_NAMESPACE) && name_str.indexOf(StaticStrings.NS_SEP, StaticStrings.EXTRACTED_NAMESPACE.length()) == -1) { 1386 1386 name_str = name_str.substring (StaticStrings.EXTRACTED_NAMESPACE.length ()); 1387 1387 } … … 1435 1435 } 1436 1436 1437 if(content.startsWith (StaticStrings.EXTRACTED_NAMESPACE) ) {1437 if(content.startsWith (StaticStrings.EXTRACTED_NAMESPACE) && content.indexOf(StaticStrings.NS_SEP, StaticStrings.EXTRACTED_NAMESPACE.length()) == -1) { 1438 1438 content = content.substring (StaticStrings.EXTRACTED_NAMESPACE.length ()); 1439 1439 } … … 1584 1584 String meta_name = language_metadata.getAttribute (StaticStrings.NAME_ATTRIBUTE); 1585 1585 Element language_meta = to.createElement (StaticStrings.LANGUAGE_METADATA_ELEMENT_STR); 1586 if(meta_name.startsWith (StaticStrings.EXTRACTED_NAMESPACE) ) {1586 if(meta_name.startsWith (StaticStrings.EXTRACTED_NAMESPACE) && meta_name.indexOf(StaticStrings.NS_SEP, StaticStrings.EXTRACTED_NAMESPACE.length()) == -1) { 1587 1587 meta_name = meta_name.substring (StaticStrings.EXTRACTED_NAMESPACE.length ()); 1588 1588 } … … 1664 1664 } 1665 1665 1666 if(name_str.startsWith (StaticStrings.EXTRACTED_NAMESPACE) ) {1666 if(name_str.startsWith (StaticStrings.EXTRACTED_NAMESPACE) && name_str.indexOf(StaticStrings.NS_SEP, StaticStrings.EXTRACTED_NAMESPACE.length()) == -1) { 1667 1667 name_str = name_str.substring (StaticStrings.EXTRACTED_NAMESPACE.length ()); 1668 1668 } -
main/trunk/gli/src/org/greenstone/gatherer/cdm/Index.java
r12798 r24367 166 166 if (source_object instanceof MetadataElement) { 167 167 String full_element_name = ((MetadataElement)source_object).getFullName(); 168 if(full_element_name.startsWith(StaticStrings.EXTRACTED_NAMESPACE) ) {168 if(full_element_name.startsWith(StaticStrings.EXTRACTED_NAMESPACE) && full_element_name.indexOf(StaticStrings.NS_SEP, StaticStrings.EXTRACTED_NAMESPACE.length()) == -1) { 169 169 id_buffer.append(full_element_name.substring(StaticStrings.EXTRACTED_NAMESPACE.length())); 170 170 } -
main/trunk/gli/src/org/greenstone/gatherer/cdm/IndexManager.java
r18886 r24367 970 970 // Determine the metadatum value 971 971 String name = source.toString(); 972 if(name.startsWith(StaticStrings.EXTRACTED_NAMESPACE) ) {972 if(name.startsWith(StaticStrings.EXTRACTED_NAMESPACE) && name.indexOf(StaticStrings.NS_SEP, StaticStrings.EXTRACTED_NAMESPACE.length()) == -1) { 973 973 name = name.substring(StaticStrings.EXTRACTED_NAMESPACE.length()); 974 974 } -
main/trunk/gli/src/org/greenstone/gatherer/cdm/PluginManager.java
r22410 r24367 119 119 if (!plugin.isAbstract()) { 120 120 String plugin_name = plugin.getName(); 121 if (!plugin_name.equals(StaticStrings.ARCPLUG_STR) && !plugin_name.equals(StaticStrings.RECPLUG_STR) && !plugin_name.equals(StaticStrings.METADATAXMLPLUG_STR)) { 121 if (!plugin_name.equals(StaticStrings.ARCPLUG_STR) && !plugin_name.equals(StaticStrings.RECPLUG_STR) 122 && !plugin_name.equals(StaticStrings.METADATAXMLPLUG_STR) && !plugin_name.equals(StaticStrings.EMBEDMETAPLUG_STR)) { 122 123 available.add(plugin); 123 124 } … … 725 726 remove.setEnabled(false); 726 727 } 727 728 728 729 else { 729 730 // don't let people remove special plugins such GreenstoneXMLPlug and GreenstoneMETSPlug, -
main/trunk/gli/src/org/greenstone/gatherer/collection/LegacyCollectionImporter.java
r11625 r24367 132 132 static private String mapLegacyMetadataElementName(String metadata_element_name) 133 133 { 134 // Remove the extracted namespace if it has been added 135 if (metadata_element_name.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) { 134 // Remove the extracted namespace if it has been added, but only 135 // if there are no subsequent namespaces following it (like ex.dc.*) 136 // since we want to preserve embedded metadata names as is. 137 if (metadata_element_name.startsWith(StaticStrings.EXTRACTED_NAMESPACE) && metadata_element_name.indexOf(StaticStrings.NS_SEP, StaticStrings.EXTRACTED_NAMESPACE.length()) == -1) { 136 138 metadata_element_name = metadata_element_name.substring(StaticStrings.EXTRACTED_NAMESPACE.length()); 137 139 } -
main/trunk/gli/src/org/greenstone/gatherer/metadata/MetadataElement.java
r23394 r24367 196 196 197 197 198 public boolean isGSExtractedMetadataElement() 199 { 200 return getNamespace().equals(MetadataSetManager.EXTRACTED_METADATA_NAMESPACE); 201 } 202 198 203 public boolean isExtractedMetadataElement() 199 204 { 200 return getNamespace().equals(MetadataSetManager.EXTRACTED_METADATA_NAMESPACE); 201 } 205 return getNamespace().startsWith(MetadataSetManager.EXTRACTED_METADATA_NAMESPACE); 206 } 207 202 208 203 209 public boolean isPredefined() { -
main/trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java
r22970 r24367 96 96 static final public String DOCUMENT_STR = "document"; 97 97 static final public String DOT_CHARACTER = "."; 98 static final public String EMBEDMETAPLUG_STR = "EmbeddedMetadataPlugin"; 98 99 static final public String EMPTY_STR = ""; 99 100 static final public String ENGLISH_LANGUAGE_STR = "en"; … … 156 157 static final public String INT_STR = "int"; 157 158 static final public String IMPORT_STR = "import"; 158 static final public String[] KEEP_PLUG = { "GreenstoneXMLPlugin", "GreenstoneMETSPlugin" };159 static final public String[] KEEP_PLUG = { "GreenstoneXMLPlugin", "GreenstoneMETSPlugin", "EmbeddedMetadataPlugin" }; 159 160 static final public String LANGUAGE_ARGUMENT = "l="; 160 161 static final public String LANGUAGE_ATTRIBUTE = "language";
Note:
See TracChangeset
for help on using the changeset viewer.