Changeset 7457
- Timestamp:
- 2004-05-27T12:03:43+12:00 (20 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java
r7288 r7457 239 239 return self.metadataToString(command_element, show_extracted_namespace); 240 240 } 241 else if(command_element_name.equals(COLLECTIONMETADATA_BETA_ELEMENT)) {242 return self.metadataToString(command_element, show_extracted_namespace);243 }241 // else if(command_element_name.equals(COLLECTIONMETADATA_BETA_ELEMENT)) { 242 // return self.metadataToString(command_element, show_extracted_namespace); 243 // } 244 244 else if(command_element_name.equals(PLUGIN_ELEMENT)) { 245 245 return self.pluginToString(command_element, show_extracted_namespace); … … 308 308 static final private String EXTRACTED_PREFIX = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP; 309 309 /** Gives the preferred ordering of commands */ 310 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};310 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}; 311 311 312 312 /** ************************** Public Data Members ***************************/ … … 355 355 dialog.show(); 356 356 } 357 358 public Element getBeta() {359 Element element = getOrCreateElementByTagName(COLLECTIONMETADATA_BETA_ELEMENT, null, null);360 element.setAttribute(NAME_ATTRIBUTE, COLLECTIONMETADATA_BETA_STR);361 element.setAttribute(SPECIAL_ATTRIBUTE, TRUE_STR);362 return element;363 }357 358 // public Element getBeta() { 359 // Element element = getOrCreateElementByTagName(COLLECTIONMETADATA_BETA_ELEMENT, null, null); 360 // element.setAttribute(NAME_ATTRIBUTE, COLLECTIONMETADATA_BETA_STR); 361 // element.setAttribute(SPECIAL_ATTRIBUTE, TRUE_STR); 362 // return element; 363 // } 364 364 365 365 public Element getCreator() { … … 758 758 special = true; 759 759 } 760 else if (name_str.equals(COLLECTIONMETADATA_BETA_STR) ||name_str.equals(COLLECTIONMETADATA_CREATOR_STR) || name_str.equals(COLLECTIONMETADATA_PUBLIC_STR)) {760 else if (/* name_str.equals(COLLECTIONMETADATA_BETA_STR) || */ name_str.equals(COLLECTIONMETADATA_CREATOR_STR) || name_str.equals(COLLECTIONMETADATA_PUBLIC_STR)) { 761 761 text.append(name_str); 762 762 text.append(TAB_CHARACTER); … … 987 987 command_element = parseMetadata(tokenizer); // Revised to handle multiple lines 988 988 } 989 if(command_element == null && ( command_type.equals(COLLECTIONMETADATA_BETA_STR) ||command_type.equals(COLLECTIONMETADATA_PUBLIC_STR) || command_type.equals(COLLECTIONMETADATA_CREATOR_STR) || command_type.equals(COLLECTIONMETADATA_MAINTAINER_STR))) {989 if(command_element == null && (/* command_type.equals(COLLECTIONMETADATA_BETA_STR) || */ command_type.equals(COLLECTIONMETADATA_PUBLIC_STR) || command_type.equals(COLLECTIONMETADATA_CREATOR_STR) || command_type.equals(COLLECTIONMETADATA_MAINTAINER_STR))) { 990 990 command_element = parseMetadataSpecial(command_str); 991 991 } … … 1378 1378 String name_str = tokenizer.nextToken(); 1379 1379 String value_str = tokenizer.nextToken(); 1380 if(name_str.equals(COLLECTIONMETADATA_BETA_STR)) {1381 command_element = document.createElement(COLLECTIONMETADATA_BETA_ELEMENT);1382 }1383 else if(name_str.equals(COLLECTIONMETADATA_CREATOR_STR)) {1380 // if(name_str.equals(COLLECTIONMETADATA_BETA_STR)) { 1381 // command_element = document.createElement(COLLECTIONMETADATA_BETA_ELEMENT); 1382 // } 1383 if (name_str.equals(COLLECTIONMETADATA_CREATOR_STR)) { 1384 1384 command_element = document.createElement(COLLECTIONMETADATA_CREATOR_ELEMENT); 1385 1385 }
Note:
See TracChangeset
for help on using the changeset viewer.