- Timestamp:
- 2009-08-30T18:41:54+12:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/trunk/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java
r20007 r20440 214 214 String command_element_name = command_element.getNodeName (); 215 215 if(command_element_name.equals (StaticStrings.CLASSIFY_ELEMENT)) { 216 return classifyToString (command_element , show_extracted_namespace);216 return classifyToString (command_element); 217 217 } 218 218 else if(command_element_name.equals (StaticStrings.FORMAT_ELEMENT)) { 219 return formatToString (command_element , show_extracted_namespace);219 return formatToString (command_element); 220 220 } 221 221 else if(command_element_name.equals (StaticStrings.INDEXES_ELEMENT)) { 222 return indexesToString (command_element , show_extracted_namespace);222 return indexesToString (command_element); 223 223 } 224 224 else if(command_element_name.equals (StaticStrings.INDEX_DEFAULT_ELEMENT)) { 225 return indexDefaultToString (command_element , show_extracted_namespace);225 return indexDefaultToString (command_element); 226 226 } 227 227 else if(command_element_name.equals (StaticStrings.LANGUAGES_ELEMENT)) { … … 232 232 } 233 233 else if (command_element_name.equals (StaticStrings.LANGUAGE_METADATA_ELEMENT)) { 234 return languageMetadataToString (command_element , show_extracted_namespace);234 return languageMetadataToString (command_element); 235 235 } 236 236 else if(command_element_name.equals (StaticStrings.INDEXOPTIONS_ELEMENT)) { … … 256 256 } 257 257 else if(command_element_name.equals (StaticStrings.PLUGIN_ELEMENT)) { 258 return pluginToString (command_element , show_extracted_namespace);258 return pluginToString (command_element); 259 259 } 260 260 else if(command_element_name.equals (StaticStrings.SUBCOLLECTION_ELEMENT)) { 261 return subcollectionToString (command_element , show_extracted_namespace);261 return subcollectionToString (command_element); 262 262 } 263 263 else if(command_element_name.equals (StaticStrings.SUBCOLLECTION_DEFAULT_INDEX_ELEMENT)) { … … 433 433 /** ************************** Private Methods ***************************/ 434 434 435 static private String classifyToString (Element command_element , boolean show_extracted_namespace) {435 static private String classifyToString (Element command_element) { 436 436 StringBuffer text = new StringBuffer (StaticStrings.CLASSIFY_STR); 437 437 text.append (StaticStrings.TAB_CHARACTER); … … 446 446 text.append (option_element.getAttribute (StaticStrings.NAME_ATTRIBUTE)); 447 447 String value_str = XMLTools.getValue (option_element); 448 value_str = modifyMetadataArgumentValue(value_str); 448 449 // value_str = modifyMetadataArgumentValue(value_str); 449 450 if (value_str.length () > 0) { 450 451 text.append (StaticStrings.SPACE_CHARACTER); 451 text.append(value_str); 452 if(value_str.indexOf (StaticStrings.SPACE_CHARACTER) != -1) { 453 // enclose in quotes 454 text.append(StaticStrings.SPEECH_CHARACTER); 455 text.append(value_str); 456 text.append(StaticStrings.SPEECH_CHARACTER); 457 } else { 458 459 text.append(value_str); 460 } 452 461 } 453 462 … … 460 469 } 461 470 462 static private String formatToString (Element command_element , boolean show_extracted_namespace) {471 static private String formatToString (Element command_element) { 463 472 StringBuffer text = new StringBuffer (StaticStrings.FORMAT_STR); 464 473 text.append (StaticStrings.SPACE_CHARACTER); … … 472 481 // Remember to encode format string to Greenstone specification 473 482 value_str = Codec.transform (XMLTools.getValue (command_element), Codec.DOM_TO_GREENSTONE); 474 // Remove any references to a namespace for extracted metadata475 if (!show_extracted_namespace) {476 String match_string = "\\[" + MetadataSetManager.EXTRACTED_METADATA_NAMESPACE + "\\.";477 value_str = value_str.replaceAll (match_string, "[");478 }479 480 483 text.append (StaticStrings.SPEECH_CHARACTER); 481 484 text.append (value_str); … … 524 527 } 525 528 526 static private String indexesToString (Element command_element , boolean show_extracted_namespace) {529 static private String indexesToString (Element command_element) { 527 530 boolean comment_only = false; 528 531 StringBuffer text = new StringBuffer (""); … … 558 561 Element content_element = (Element) content_elements.item (k); 559 562 String name_str = content_element.getAttribute (StaticStrings.NAME_ATTRIBUTE); 560 if(!show_extracted_namespace && name_str.startsWith (StaticStrings.EXTRACTED_NAMESPACE)) {561 name_str = name_str.substring (StaticStrings.EXTRACTED_NAMESPACE.length ());562 }563 563 text.append (name_str); 564 564 name_str = null; … … 578 578 } 579 579 580 static private String indexDefaultToString (Element command_element , boolean show_extracted_namespace) {580 static private String indexDefaultToString (Element command_element) { 581 581 StringBuffer text = new StringBuffer (""); 582 582 if(command_element.getAttribute (StaticStrings.ASSIGNED_ATTRIBUTE).equals (StaticStrings.FALSE_STR)) { … … 594 594 Element content_element = (Element) content_elements.item (j); 595 595 String name_str = content_element.getAttribute (StaticStrings.NAME_ATTRIBUTE); 596 if(!show_extracted_namespace && name_str.startsWith (StaticStrings.EXTRACTED_NAMESPACE)) {597 name_str = name_str.substring (StaticStrings.EXTRACTED_NAMESPACE.length ());598 }599 596 text.append (name_str); 600 597 name_str = null; … … 634 631 } 635 632 636 static private String languageMetadataToString (Element command_element , boolean show_extracted_namespace) {633 static private String languageMetadataToString (Element command_element) { 637 634 if (!command_element.getAttribute (StaticStrings.ASSIGNED_ATTRIBUTE).equals (StaticStrings.TRUE_STR)) { 638 635 return ""; … … 641 638 text.append (StaticStrings.TAB_CHARACTER); 642 639 String name_str = command_element.getAttribute (StaticStrings.NAME_ATTRIBUTE); 643 if(!show_extracted_namespace && name_str.startsWith (StaticStrings.EXTRACTED_NAMESPACE)) {644 name_str = name_str.substring (StaticStrings.EXTRACTED_NAMESPACE.length ());645 }646 640 text.append (name_str); 647 641 return text.toString (); … … 925 919 String value = (String) arguments.get (name); // Can be null 926 920 // The metadata argument gets added as the content attribute 927 921 /* if (name.equals (StaticStrings.METADATA_ARGUMENT) && value != null) { 928 922 // Add the extracted namespace onto un-namespaced metadata names 929 923 StringTokenizer string_tokenizer = new StringTokenizer (value, ","); … … 947 941 value = value + token; 948 942 } 949 } 943 }*/ 950 944 // Everything else is an Option Element 951 945 Element option_element = document.createElement (StaticStrings.OPTION_ELEMENT); … … 1503 1497 } 1504 1498 1505 static private String pluginToString (Element command_element , boolean show_extracted_namespace) {1499 static private String pluginToString (Element command_element) { 1506 1500 if(command_element.getAttribute (StaticStrings.SEPARATOR_ATTRIBUTE).equals (StaticStrings.TRUE_STR)) { 1507 1501 return ""; … … 1521 1515 text.append (option_element.getAttribute (StaticStrings.NAME_ATTRIBUTE)); 1522 1516 String value_str = XMLTools.getValue (option_element); 1523 1524 value_str = modifyMetadataArgumentValue(value_str); 1525 // are there any valid cases of "" args?? 1517 // turn display name into proper name 1518 //value_str = modifyMetadataArgumentValue(value_str); 1526 1519 if (value_str.length () > 0) { 1527 1520 text.append (StaticStrings.SPACE_CHARACTER); 1528 text.append(value_str); 1521 if(value_str.indexOf (StaticStrings.SPACE_CHARACTER) != -1) { 1522 // enclose in quotes 1523 text.append(StaticStrings.SPEECH_CHARACTER); 1524 text.append(value_str); 1525 text.append(StaticStrings.SPEECH_CHARACTER); 1526 } else { 1527 1528 text.append(value_str); 1529 } 1529 1530 } 1530 1531 … … 1540 1541 1541 1542 // Convert metadata element names to internal names, and remove extracted metadata namespaces 1542 static private String modifyMetadataArgumentValue(String value_str) {1543 /* static private String modifyMetadataArgumentValue(String value_str) { 1543 1544 if (value_str.length () == 0) { 1544 1545 return value_str; … … 1554 1555 // not a delimiter token 1555 1556 if (!raw_token.equals(",") && !raw_token.equals(";")) { 1556 MetadataElement metadata_element = MetadataTools.getMetadataElementWithDisplayName (token);1557 if (metadata_element != null) {1558 token = metadata_element.getFullName ();1559 modified_token = true;1560 }1557 //MetadataElement metadata_element = MetadataTools.getMetadataElementWithDisplayName (token); 1558 //if (metadata_element != null) { 1559 //token = metadata_element.getFullName (); 1560 //modified_token = true; 1561 //} 1561 1562 1562 if (token.startsWith (StaticStrings.EXTRACTED_NAMESPACE)) {1563 1564 1565 }1563 // if (token.startsWith (StaticStrings.EXTRACTED_NAMESPACE)) { 1564 // token = token.substring (StaticStrings.EXTRACTED_NAMESPACE.length ()); 1565 // modified_token = true; 1566 //} 1566 1567 } 1567 1568 if (modified_token) { … … 1586 1587 return value_buffer.toString(); 1587 1588 1588 }1589 }*/ 1589 1590 1590 1591 static private String searchtypeToString (Element command_element) { … … 1606 1607 } 1607 1608 1608 static private String subcollectionToString (Element command_element , boolean show_extracted_namespace) {1609 static private String subcollectionToString (Element command_element) { 1609 1610 StringBuffer text = new StringBuffer (StaticStrings.SUBCOLLECTION_STR); 1610 1611 text.append (StaticStrings.SPACE_CHARACTER); … … 1616 1617 text.append (StaticStrings.EXCLAMATION_CHARACTER); 1617 1618 } 1618 String content_str = command_element.getAttribute (StaticStrings.CONTENT_ATTRIBUTE); 1619 if(!show_extracted_namespace && content_str.startsWith (StaticStrings.EXTRACTED_NAMESPACE)) { 1620 content_str = content_str.substring (StaticStrings.EXTRACTED_NAMESPACE.length ()); 1621 } 1622 text.append (content_str); 1623 content_str = null; 1619 text.append (command_element.getAttribute (StaticStrings.CONTENT_ATTRIBUTE)); 1624 1620 text.append (StaticStrings.SEPARATOR_CHARACTER); 1625 1621 text.append (XMLTools.getValue (command_element));
Note:
See TracChangeset
for help on using the changeset viewer.