Changeset 7624
- Timestamp:
- 2004-06-21T09:56:20+12:00 (20 years ago)
- Location:
- trunk/gli/src/org/greenstone/gatherer
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java
r7604 r7624 306 306 static private CollectionConfiguration self; 307 307 308 static final private String EXTRACTED_PREFIX = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP;309 308 /** Gives the preferred ordering of commands */ 310 309 static final private String[] COMMAND_ORDER = {StaticStrings.COLLECTIONMETADATA_CREATOR_ELEMENT, StaticStrings.COLLECTIONMETADATA_MAINTAINER_ELEMENT, StaticStrings.COLLECTIONMETADATA_PUBLIC_ELEMENT, /* StaticStrings.COLLECTIONMETADATA_BETA_ELEMENT, */ StaticStrings.SEARCHTYPE_ELEMENT, StaticStrings.PLUGIN_ELEMENT, StaticStrings.INDEXES_ELEMENT, StaticStrings.LEVELS_ELEMENT, StaticStrings.INDEX_DEFAULT_ELEMENT, StaticStrings.LANGUAGES_ELEMENT, StaticStrings.LANGUAGE_DEFAULT_ELEMENT, StaticStrings.SUBCOLLECTION_ELEMENT, StaticStrings.SUBCOLLECTION_INDEXES_ELEMENT, StaticStrings.SUBCOLLECTION_DEFAULT_INDEX_ELEMENT, StaticStrings.SUPERCOLLECTION_ELEMENT, StaticStrings.CLASSIFY_ELEMENT, StaticStrings.FORMAT_ELEMENT, StaticStrings.COLLECTIONMETADATA_ELEMENT}; … … 543 542 while (string_tokenizer.hasMoreElements()) { 544 543 String token = (String) string_tokenizer.nextElement(); 545 if (token.startsWith( EXTRACTED_PREFIX)) {546 token = token.substring( EXTRACTED_PREFIX.length());544 if (token.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) { 545 token = token.substring(StaticStrings.EXTRACTED_NAMESPACE.length()); 547 546 } 548 547 … … 672 671 Element content_element = (Element) content_elements.item(k); 673 672 String name_str = content_element.getAttribute(NAME_ATTRIBUTE); 674 if(!show_extracted_namespace && name_str.startsWith( EXTRACTED_PREFIX)) {675 name_str = name_str.substring( EXTRACTED_PREFIX.length());673 if(!show_extracted_namespace && name_str.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) { 674 name_str = name_str.substring(StaticStrings.EXTRACTED_NAMESPACE.length()); 676 675 } 677 676 text.append(name_str); … … 706 705 Element content_element = (Element) content_elements.item(j); 707 706 String name_str = content_element.getAttribute(NAME_ATTRIBUTE); 708 if(!show_extracted_namespace && name_str.startsWith( EXTRACTED_PREFIX)) {709 name_str = name_str.substring( EXTRACTED_PREFIX.length());707 if(!show_extracted_namespace && name_str.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) { 708 name_str = name_str.substring(StaticStrings.EXTRACTED_NAMESPACE.length()); 710 709 } 711 710 text.append(name_str); … … 1139 1138 String token = (String) string_tokenizer.nextElement(); 1140 1139 if (token.indexOf(MSMUtils.NS_SEP) == -1) { 1141 token = EXTRACTED_PREFIX+ token;1140 token = StaticStrings.EXTRACTED_NAMESPACE + token; 1142 1141 } 1143 1142 … … 1249 1248 } 1250 1249 else { 1251 content_str = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP+ content_str;1250 content_str = StaticStrings.EXTRACTED_NAMESPACE + content_str; 1252 1251 } 1253 1252 } … … 1474 1473 // The metadata argument must be the fully qualified name of a metadata element, so if it doesn't yet have a namespace, append the extracted metadata namespace. 1475 1474 if(value.indexOf(MSMUtils.NS_SEP) == -1) { 1476 value = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP+ value;1475 value = StaticStrings.EXTRACTED_NAMESPACE + value; 1477 1476 } 1478 1477 } … … 1557 1556 // 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. 1558 1557 if(!content_str.equals(StaticStrings.FILENAME_STR) && content_str.indexOf(MSMUtils.NS_SEP) == -1) { 1559 content_str = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP+ content_str;1558 content_str = StaticStrings.EXTRACTED_NAMESPACE + content_str; 1560 1559 } 1561 1560 command_element.setAttribute(CONTENT_ATTRIBUTE, content_str); … … 1670 1669 text.append(option_element.getAttribute(NAME_ATTRIBUTE)); 1671 1670 String value_str = MSMUtils.getValue(option_element); 1672 if(!show_extracted_namespace && value_str.startsWith( EXTRACTED_PREFIX)) {1673 value_str = value_str.substring( EXTRACTED_PREFIX.length());1671 if(!show_extracted_namespace && value_str.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) { 1672 value_str = value_str.substring(StaticStrings.EXTRACTED_NAMESPACE.length()); 1674 1673 } 1675 1674 if(value_str.length() > 0) { … … 1726 1725 } 1727 1726 String content_str = command_element.getAttribute(CONTENT_ATTRIBUTE); 1728 if(!show_extracted_namespace && content_str.startsWith( EXTRACTED_PREFIX)) {1729 content_str = content_str.substring( EXTRACTED_PREFIX.length());1727 if(!show_extracted_namespace && content_str.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) { 1728 content_str = content_str.substring(StaticStrings.EXTRACTED_NAMESPACE.length()); 1730 1729 } 1731 1730 text.append(content_str); -
trunk/gli/src/org/greenstone/gatherer/cdm/Index.java
r6770 r7624 172 172 if(source_object instanceof ElementWrapper) { 173 173 String full_element_name = ((ElementWrapper)source_object).getName(); 174 if(full_element_name.startsWith( Utility.EXTRACTED_METADATA_NAMESPACE)) {175 id_buffer.append(full_element_name.substring( Utility.EXTRACTED_METADATA_NAMESPACE.length() + 1));174 if(full_element_name.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) { 175 id_buffer.append(full_element_name.substring(StaticStrings.EXTRACTED_NAMESPACE.length())); 176 176 } 177 177 else { -
trunk/gli/src/org/greenstone/gatherer/cdm/IndexManager.java
r7151 r7624 45 45 import org.greenstone.gatherer.msm.MSMUtils; 46 46 import org.greenstone.gatherer.util.ExclusiveListSelectionListener; 47 import org.greenstone.gatherer.util.StaticStrings; 47 48 import org.greenstone.gatherer.util.Utility; 48 49 import org.w3c.dom.*; … … 1263 1264 // Determine the metadatum value 1264 1265 String name = source.toString(); 1265 if(name.startsWith( Utility.EXTRACTED_METADATA_NAMESPACE)) {1266 name = name.substring( Utility.EXTRACTED_METADATA_NAMESPACE.length() + 1);1266 if(name.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) { 1267 name = name.substring(StaticStrings.EXTRACTED_NAMESPACE.length()); 1267 1268 } 1268 1269 // Create new metadatum … … 1393 1394 id = selected_object.toString(); 1394 1395 } 1395 if(id.startsWith( Utility.EXTRACTED_METADATA_NAMESPACE)) {1396 id = id.substring( Utility.EXTRACTED_METADATA_NAMESPACE.length() + 1);1396 if(id.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) { 1397 id = id.substring(StaticStrings.EXTRACTED_NAMESPACE.length()); 1397 1398 } 1398 1399 Index index = getIndex(id); -
trunk/gli/src/org/greenstone/gatherer/cdm/SubcollectionManager.java
r6389 r7624 411 411 source = element_wrapper.getName(); 412 412 if(source.indexOf(MSMUtils.NS_SEP) == -1) { 413 source = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP+ source;413 source = StaticStrings.EXTRACTED_NAMESPACE + source; 414 414 } 415 415 } … … 497 497 source = element_wrapper.getName(); 498 498 if(source.indexOf(MSMUtils.NS_SEP) == -1) { 499 source = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP+ source;499 source = StaticStrings.EXTRACTED_NAMESPACE + source; 500 500 } 501 501 } … … 538 538 String e_name = e.getName(); 539 539 if(e_name.indexOf(MSMUtils.NS_SEP) == -1) { 540 e_name = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP+ e_name;540 e_name = StaticStrings.EXTRACTED_NAMESPACE + e_name; 541 541 } 542 542 //ystem.err.print("Compare to: " + e_name); -
trunk/gli/src/org/greenstone/gatherer/msm/MetadataXMLFile.java
r7313 r7624 128 128 // If this is extracted metadata, we use a special element name that won't be recognized by greenstone 129 129 String current_metadata_type = StaticStrings.METADATA_ELEMENT; 130 if(name.startsWith( Utility.EXTRACTED_METADATA_NAMESPACE)) {130 if(name.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) { 131 131 current_metadata_type = StaticStrings.EXTRACTED_METADATA_ELEMENT; 132 name = name.substring( Utility.EXTRACTED_METADATA_NAMESPACE.length() + 1);132 name = name.substring(StaticStrings.EXTRACTED_NAMESPACE.length()); 133 133 } 134 134 … … 540 540 // If this is extracted metadata, we use a special element name that won't be recognized by greenstone 541 541 String current_metadata_type = StaticStrings.METADATA_ELEMENT; 542 if(removing_metadata_name.startsWith( Utility.EXTRACTED_METADATA_NAMESPACE)) {542 if(removing_metadata_name.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) { 543 543 current_metadata_type = StaticStrings.EXTRACTED_METADATA_ELEMENT; 544 removing_metadata_name = removing_metadata_name.substring( Utility.EXTRACTED_METADATA_NAMESPACE.length() + 1);544 removing_metadata_name = removing_metadata_name.substring(StaticStrings.EXTRACTED_NAMESPACE.length()); 545 545 } 546 546
Note:
See TracChangeset
for help on using the changeset viewer.