Changeset 8015
- Timestamp:
- 2004-08-20T13:59:02+12:00 (20 years ago)
- Location:
- trunk/gli/src/org/greenstone/gatherer
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gli/src/org/greenstone/gatherer/Configuration.java
r7739 r8015 44 44 import javax.swing.*; 45 45 import javax.swing.plaf.*; 46 import org.greenstone.gatherer.msm.MSMUtils;47 46 import org.greenstone.gatherer.util.StaticStrings; 48 47 import org.greenstone.gatherer.util.Utility; 48 import org.greenstone.gatherer.util.XMLTools; 49 49 import org.w3c.dom.*; 50 50 … … 251 251 252 252 // Determine the Directory Mappings element 253 directory_mappings_element = (Element) MSMUtils.getNodeFromNamed(general_config.getDocumentElement(), StaticStrings.DIRECTORY_MAPPINGS_ELEMENT);253 directory_mappings_element = (Element) XMLTools.getNodeFromNamed(general_config.getDocumentElement(), StaticStrings.DIRECTORY_MAPPINGS_ELEMENT); 254 254 255 255 // Re-establish the color settings. … … 346 346 if(document_element != null) { 347 347 // Retrieve the Gatherer element 348 Element gatherer_element = (Element) MSMUtils.getNodeFromNamed(document_element, GATHERER_CONFIG);348 Element gatherer_element = (Element) XMLTools.getNodeFromNamed(document_element, GATHERER_CONFIG); 349 349 NodeList arguments = gatherer_element.getElementsByTagName(GATHERER_CONFIG_ARGUMENT); 350 350 for(int i = 0; i < arguments.getLength(); i++) { 351 351 Element argument_element = (Element) arguments.item(i); 352 352 if(argument_element.getAttribute(ARGUMENT_NAME).matches(property_pattern)) { 353 String result = MSMUtils.getValue(argument_element);353 String result = XMLTools.getValue(argument_element); 354 354 // Store a mapping in the cache. Sometimes we will overwrite an existing value (say for collection and general level workflow options) but the processing overhead of detecting these clashes far exceeds any savings. 355 355 put(argument_element.getAttribute(ARGUMENT_NAME) + general, new SoftReference(argument_element)); … … 371 371 // Retrieve the other information subtree. 372 372 Element document_element = general_config.getDocumentElement(); 373 Element other_element = (Element) MSMUtils.getNodeFromNamed(document_element, OTHER);373 Element other_element = (Element) XMLTools.getNodeFromNamed(document_element, OTHER); 374 374 NodeList argument_elements = other_element.getElementsByTagName(OTHER_INFO); 375 375 for(int i = 0; argument_element == null && i < argument_elements.getLength(); i++) { 376 376 Element possible_element = (Element) argument_elements.item(i); 377 Element possible_name_element = (Element) MSMUtils.getNodeFromNamed(possible_element, NAME);378 String possible_name = MSMUtils.getValue(possible_name_element);377 Element possible_name_element = (Element) XMLTools.getNodeFromNamed(possible_element, NAME); 378 String possible_name = XMLTools.getValue(possible_name_element); 379 379 ///ystem.err.println("Does " + possible_name + " equal " + filename); 380 380 if(possible_name.equalsIgnoreCase(filename)) { … … 398 398 public String getArgumentsLanguage() { 399 399 Element document_element = general_config.getDocumentElement(); 400 Element other_element = (Element) MSMUtils.getNodeFromNamed(document_element, OTHER);400 Element other_element = (Element) XMLTools.getNodeFromNamed(document_element, OTHER); 401 401 String lang = other_element.getAttribute(LANGUAGE); 402 402 if (lang == null) { … … 621 621 if(argument_element != null) { 622 622 cache_hit++; 623 result = MSMUtils.getValue(argument_element);623 result = XMLTools.getValue(argument_element); 624 624 } 625 625 } … … 637 637 if(document_element != null) { 638 638 // Retrieve the Gatherer element 639 Element gatherer_element = (Element) MSMUtils.getNodeFromNamed(document_element, GATHERER_CONFIG);639 Element gatherer_element = (Element) XMLTools.getNodeFromNamed(document_element, GATHERER_CONFIG); 640 640 NodeList arguments = gatherer_element.getElementsByTagName(GATHERER_CONFIG_ARGUMENT); 641 641 for(int i = 0; result.length() == 0 && i < arguments.getLength(); i++) { 642 642 Element argument_element = (Element) arguments.item(i); 643 643 if(argument_element.getAttribute(ARGUMENT_NAME).equalsIgnoreCase(property)) { 644 result = MSMUtils.getValue(argument_element);644 result = XMLTools.getValue(argument_element); 645 645 // Store a mapping in the cache. Sometimes we will overwrite an existing value (say for collection and general level workflow options) but the processing overhead of detecting these clashes far exceeds any savings. 646 646 put(property + general, new SoftReference(argument_element)); … … 693 693 Element mapping_element = (Element) mappings.item(i); 694 694 if(mapping_element.getAttribute(StaticStrings.NAME_ATTRIBUTE).equalsIgnoreCase(name)) { 695 file = new File( MSMUtils.getValue(mapping_element));695 file = new File(XMLTools.getValue(mapping_element)); 696 696 directory_mappings_element.removeChild(mapping_element); 697 697 found = true; … … 745 745 try { 746 746 Element document_element = general_config.getDocumentElement(); 747 Element other_element = (Element) MSMUtils.getNodeFromNamed(document_element, OTHER);747 Element other_element = (Element) XMLTools.getNodeFromNamed(document_element, OTHER); 748 748 // Retrieve the name of the information 749 Element arguments_name_element = (Element) MSMUtils.getNodeFromNamed(arguments_element, NAME);750 String filename = MSMUtils.getValue(arguments_element);749 Element arguments_name_element = (Element)XMLTools.getNodeFromNamed(arguments_element, NAME); 750 String filename = XMLTools.getValue(arguments_element); 751 751 // Find any argument information subtree starting with the same name 752 752 Element obsolete_arguments_element = getArguments(filename); … … 776 776 public void setArgumentsLanguage(String lang) { 777 777 Element document_element = general_config.getDocumentElement(); 778 Element other_element = (Element) MSMUtils.getNodeFromNamed(document_element, OTHER);778 Element other_element = (Element) XMLTools.getNodeFromNamed(document_element, OTHER); 779 779 other_element.setAttribute(LANGUAGE, lang); 780 780 } … … 903 903 if(argument_element == null) { 904 904 Element document_element = document.getDocumentElement(); 905 Element gatherer_element = (Element) MSMUtils.getNodeFromNamed(document_element, GATHERER_CONFIG);905 Element gatherer_element = (Element) XMLTools.getNodeFromNamed(document_element, GATHERER_CONFIG); 906 906 NodeList arguments = document_element.getElementsByTagName(GATHERER_CONFIG_ARGUMENT); 907 907 boolean found = false; -
trunk/gli/src/org/greenstone/gatherer/ServletConfiguration.java
r7326 r8015 44 44 import javax.swing.*; 45 45 import javax.swing.plaf.*; 46 import org.greenstone.gatherer.msm.MSMUtils;47 46 import org.greenstone.gatherer.util.ArrayTools; 48 47 import org.greenstone.gatherer.util.StaticStrings; 49 48 import org.greenstone.gatherer.util.Utility; 49 import org.greenstone.gatherer.util.XMLTools; 50 50 import org.w3c.dom.*; 51 51 … … 95 95 for (int i=0; i<servlet_mappings.getLength(); i++) { 96 96 Element map = (Element)servlet_mappings.item(i); 97 String name = MSMUtils.getValue(MSMUtils.getNodeFromNamed(map, "servlet-name"));98 String pattern = MSMUtils.getValue(MSMUtils.getNodeFromNamed(map, "url-pattern"));97 String name = XMLTools.getValue(XMLTools.getNodeFromNamed(map, "servlet-name")); 98 String pattern = XMLTools.getValue(XMLTools.getNodeFromNamed(map, "url-pattern")); 99 99 url_mappings.put(name, pattern); 100 100 … … 104 104 for (int i=0; i<servlets.getLength(); i++) { 105 105 Element servlet = (Element)servlets.item(i); 106 String name = MSMUtils.getValue(MSMUtils.getNodeFromNamed(servlet, "servlet-name"));107 String description = MSMUtils.getValue(MSMUtils.getNodeFromNamed(servlet, "description"));106 String name = XMLTools.getValue(XMLTools.getNodeFromNamed(servlet, "servlet-name")); 107 String description = XMLTools.getValue(XMLTools.getNodeFromNamed(servlet, "description")); 108 108 String site = getServletSite(servlet); 109 109 … … 149 149 String site = null; 150 150 for (int i=0; i<params.getLength()&& site == null; i++) { 151 String p_name = MSMUtils.getValue(MSMUtils.getNodeFromNamed(params.item(i), "param-name"));151 String p_name = XMLTools.getValue(XMLTools.getNodeFromNamed(params.item(i), "param-name")); 152 152 if (p_name.equals("site_name")) { 153 site = MSMUtils.getValue(MSMUtils.getNodeFromNamed(params.item(i), "param-value"));153 site = XMLTools.getValue(XMLTools.getNodeFromNamed(params.item(i), "param-value")); 154 154 } 155 155 } -
trunk/gli/src/org/greenstone/gatherer/cdm/Argument.java
r7997 r8015 40 40 import org.greenstone.gatherer.collection.CollectionManager; 41 41 import org.greenstone.gatherer.msm.ElementWrapper; 42 import org.greenstone.gatherer.msm.MSMUtils;43 42 import org.greenstone.gatherer.util.StaticStrings; 44 43 import org.greenstone.gatherer.util.Utility; 44 import org.greenstone.gatherer.util.XMLTools; 45 45 import org.w3c.dom.*; 46 46 … … 250 250 // Only assigned arguments have values. 251 251 if(element != null) { 252 value = MSMUtils.getValue(element);252 value = XMLTools.getValue(element); 253 253 // We may have to retrieve the language dependant string for a metadata element 254 254 if(type == METADATUM) { … … 271 271 // Only assigned arguments have values. 272 272 if(element != null) { 273 String value = MSMUtils.getValue(element);273 String value = XMLTools.getValue(element); 274 274 StringTokenizer tokenizer = new StringTokenizer(value, ","); 275 275 while(tokenizer.hasMoreTokens()) { … … 473 473 public void setValue(String value) { 474 474 if(element != null) { 475 MSMUtils.setValue(element, value);475 XMLTools.setValue(element, value); 476 476 } 477 477 else { … … 493 493 } 494 494 value.deleteCharAt(value.length() - 1); // Remove last ',' 495 MSMUtils.setValue(element, value.toString());495 XMLTools.setValue(element, value.toString()); 496 496 } 497 497 else { … … 516 516 } 517 517 text.append(name); 518 String value = MSMUtils.getValue(element);518 String value = XMLTools.getValue(element); 519 519 if(value.length() > 0) { 520 520 text.append(StaticStrings.SPACE_CHARACTER); -
trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java
r8002 r8015 27 27 package org.greenstone.gatherer.cdm; 28 28 29 /**************************************************************************************30 * Written: 01/05/0231 * Revised: 16/08/02 Optimized and Commented.32 * 11/07/03 DOM support33 **************************************************************************************/34 29 import java.awt.*; 35 30 import java.awt.event.*; … … 53 48 import org.greenstone.gatherer.gui.GComboBox; 54 49 import org.greenstone.gatherer.gui.GLIButton; 55 import org.greenstone.gatherer.msm.MSMUtils;56 50 import org.greenstone.gatherer.util.StaticStrings; 57 51 import org.greenstone.gatherer.util.Utility; 52 import org.greenstone.gatherer.util.XMLTools; 58 53 import org.w3c.dom.*; 59 54 import org.xml.sax.*; … … 462 457 String node_name = node.getNodeName(); 463 458 if (node_name.equalsIgnoreCase("ClassifyName")) { 464 String name = MSMUtils.getValue(node);459 String name = XMLTools.getValue(node); 465 460 class_list[i] = name; 466 461 i++; … … 499 494 node_name = node.getNodeName(); 500 495 if(node_name.equals("Name")) { 501 String name = MSMUtils.getValue(node);496 String name = XMLTools.getValue(node); 502 497 // We can save ourselves some processing time if a classifier with this name already exists in our manager. If so retrieve it and return it. 503 498 Classifier existing = getBaseClassifier(name); … … 508 503 } 509 504 else if(node_name.equals("Desc")) { 510 classifier.setDescription( MSMUtils.getValue(node));505 classifier.setDescription(XMLTools.getValue(node)); 511 506 } 512 507 else if(node_name.equals(CollectionConfiguration.ABSTRACT_ELEMENT)) { 513 classifier.setIsAbstract( MSMUtils.getValue(node).equalsIgnoreCase(CollectionConfiguration.YES_STR));508 classifier.setIsAbstract(XMLTools.getValue(node).equalsIgnoreCase(CollectionConfiguration.YES_STR)); 514 509 } 515 510 // Parse the multitude of arguments. … … 524 519 node_name = det.getNodeName(); 525 520 if(node_name.equals("Name")) { 526 argument.setName( MSMUtils.getValue(det));521 argument.setName(XMLTools.getValue(det)); 527 522 } 528 523 else if(node_name.equals("Desc")) { 529 argument.setDescription( MSMUtils.getValue(det));524 argument.setDescription(XMLTools.getValue(det)); 530 525 } 531 526 else if(node_name.equals("Type")) { 532 argument.setType( MSMUtils.getValue(det));527 argument.setType(XMLTools.getValue(det)); 533 528 } 534 529 else if(node_name.equals("Default")) { 535 argument.setDefaultValue( MSMUtils.getValue(det));530 argument.setDefaultValue(XMLTools.getValue(det)); 536 531 } 537 532 else if(node_name.equals("List")) { … … 544 539 node_name = subvalue.getNodeName(); 545 540 if(node_name.equals("Name")) { 546 key = MSMUtils.getValue(subvalue);541 key = XMLTools.getValue(subvalue); 547 542 } 548 543 else if(node_name.equals("Desc")) { 549 desc = MSMUtils.getValue(subvalue);544 desc = XMLTools.getValue(subvalue); 550 545 } 551 546 } … … 557 552 } 558 553 else if(node_name.equals("Required")) { 559 String v = MSMUtils.getValue(det);554 String v = XMLTools.getValue(det); 560 555 ///ystem.err.println("Required = " + v); 561 556 if(v.equalsIgnoreCase("yes")) { … … 565 560 } 566 561 else if(node_name.equals(StaticStrings.RANGE_ELEMENT)) { 567 String range_raw = MSMUtils.getValue(det);562 String range_raw = XMLTools.getValue(det); 568 563 int index = -1; 569 564 if((index = range_raw.indexOf(StaticStrings.COMMA_CHARACTER)) != -1) { -
trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java
r7624 r8015 35 35 import org.greenstone.gatherer.cdm.CommandTokenizer; 36 36 import org.greenstone.gatherer.gui.GLIButton; 37 import org.greenstone.gatherer.msm.MSMUtils;38 37 import org.greenstone.gatherer.util.DOMTree; 39 38 import org.greenstone.gatherer.util.Codec; 40 39 import org.greenstone.gatherer.util.StaticStrings; 41 40 import org.greenstone.gatherer.util.Utility; 41 import org.greenstone.gatherer.util.XMLTools; 42 42 import org.w3c.dom.*; 43 43 … … 534 534 text.append(StaticStrings.MINUS_CHARACTER); 535 535 text.append(option_element.getAttribute(NAME_ATTRIBUTE)); 536 String value_str = MSMUtils.getValue(option_element);536 String value_str = XMLTools.getValue(option_element); 537 537 538 538 // Remove the extracted metadata namespaces if required … … 584 584 else { 585 585 // Remember to encode format string to Greenstone specification 586 value_str = Codec.transform( MSMUtils.getValue(command_element), Codec.DOM_TO_GREENSTONE);586 value_str = Codec.transform(XMLTools.getValue(command_element), Codec.DOM_TO_GREENSTONE); 587 587 // Remove any references to a namespace for extracted metadata 588 588 if (!show_extracted_namespace) { … … 806 806 name_str = null; 807 807 808 String value_str = MSMUtils.getValue(command_element);808 String value_str = XMLTools.getValue(command_element); 809 809 // The value string we retrieved will be encoded for xml, so we now decode it - to text if text_value set. This parameter was originally show_extracted_namespace, but sincethis is only true for 'toString()' commands from within the CDM, its good enough to determine if this toString() will be used to display on screen, or write to collect.cfg 810 810 if(text_value == CollectionMeta.TEXT) { … … 1032 1032 // No-one knows what to do with this command, so we create an Unknown command element 1033 1033 command_element = document.createElement(UNKNOWN_ELEMENT); 1034 MSMUtils.setValue(command_element, command_str);1034 XMLTools.setValue(command_element, command_str); 1035 1035 } 1036 1036 } … … 1096 1096 element.setAttribute(LANGUAGE_ATTRIBUTE, Gatherer.config.getLanguage()); 1097 1097 element.setAttribute(ASSIGNED_ATTRIBUTE, TRUE_STR); 1098 MSMUtils.setValue(element, value);1098 XMLTools.setValue(element, value); 1099 1099 document_element.appendChild(element); 1100 1100 element = null; … … 1137 1137 while (string_tokenizer.hasMoreElements()) { 1138 1138 String token = (String) string_tokenizer.nextElement(); 1139 if (token.indexOf( MSMUtils.NS_SEP) == -1) {1139 if (token.indexOf(StaticStrings.NS_SEP) == -1) { 1140 1140 token = StaticStrings.EXTRACTED_NAMESPACE + token; 1141 1141 } … … 1155 1155 value = value.substring(1, value.length() - 1); 1156 1156 } 1157 MSMUtils.setValue(option_element, value);1157 XMLTools.setValue(option_element, value); 1158 1158 } 1159 1159 option_element.setAttribute(ASSIGNED_ATTRIBUTE, TRUE_STR); … … 1190 1190 // Ready the value str (which can contain all sorts of funky characters) for writing as a DOM value 1191 1191 value_str = Codec.transform(value_str, Codec.GREENSTONE_TO_DOM); 1192 MSMUtils.setValue(command_element, value_str);1192 XMLTools.setValue(command_element, value_str); 1193 1193 } 1194 1194 } … … 1243 1243 String content_str = content_tokenizer.nextToken(); 1244 1244 // 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. 1245 if(content_str.indexOf( MSMUtils.NS_SEP) == -1) {1245 if(content_str.indexOf(StaticStrings.NS_SEP) == -1) { 1246 1246 if(content_str.equals(StaticStrings.TEXT_STR) || (!old_index && content_str.equals(StaticStrings.ALLFIELDS_STR))) { 1247 1247 // Our special strings are OK. … … 1379 1379 command_element.setAttribute(LANGUAGE_ATTRIBUTE, language_str); 1380 1380 command_element.setAttribute(ASSIGNED_ATTRIBUTE, TRUE_STR); 1381 MSMUtils.setValue(command_element, value_str);1381 XMLTools.setValue(command_element, value_str); 1382 1382 } 1383 1383 else { … … 1426 1426 value_str = value_str.substring(1, value_str.length() - 1); 1427 1427 } 1428 MSMUtils.setValue(command_element, value_str);1428 XMLTools.setValue(command_element, value_str); 1429 1429 } 1430 1430 value_str = null; … … 1472 1472 if(name.equals(METADATA_ARGUMENT)) { 1473 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. 1474 if(value.indexOf( MSMUtils.NS_SEP) == -1) {1474 if(value.indexOf(StaticStrings.NS_SEP) == -1) { 1475 1475 value = StaticStrings.EXTRACTED_NAMESPACE + value; 1476 1476 } 1477 1477 } 1478 MSMUtils.setValue(option_element, value);1478 XMLTools.setValue(option_element, value); 1479 1479 } 1480 1480 command_element.appendChild(option_element); … … 1555 1555 String content_str = pattern_tokenizer.nextToken(); 1556 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. 1557 if(!content_str.equals(StaticStrings.FILENAME_STR) && content_str.indexOf( MSMUtils.NS_SEP) == -1) {1557 if(!content_str.equals(StaticStrings.FILENAME_STR) && content_str.indexOf(StaticStrings.NS_SEP) == -1) { 1558 1558 content_str = StaticStrings.EXTRACTED_NAMESPACE + content_str; 1559 1559 } 1560 1560 command_element.setAttribute(CONTENT_ATTRIBUTE, content_str); 1561 MSMUtils.setValue(command_element, pattern_tokenizer.nextToken());1561 XMLTools.setValue(command_element, pattern_tokenizer.nextToken()); 1562 1562 if(pattern_tokenizer.hasMoreTokens()) { 1563 1563 command_element.setAttribute(OPTIONS_ATTRIBUTE, pattern_tokenizer.nextToken()); … … 1668 1668 text.append(StaticStrings.MINUS_CHARACTER); 1669 1669 text.append(option_element.getAttribute(NAME_ATTRIBUTE)); 1670 String value_str = MSMUtils.getValue(option_element);1670 String value_str = XMLTools.getValue(option_element); 1671 1671 if(!show_extracted_namespace && value_str.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) { 1672 1672 value_str = value_str.substring(StaticStrings.EXTRACTED_NAMESPACE.length()); … … 1731 1731 content_str = null; 1732 1732 text.append(SEPARATOR_CHARACTER); 1733 text.append( MSMUtils.getValue(command_element));1733 text.append(XMLTools.getValue(command_element)); 1734 1734 text.append(SEPARATOR_CHARACTER); 1735 1735 String options_str = command_element.getAttribute(OPTIONS_ATTRIBUTE); … … 1803 1803 1804 1804 private String unknownToString(Element command_element) { 1805 return MSMUtils.getValue(command_element);1805 return XMLTools.getValue(command_element); 1806 1806 } 1807 1807 -
trunk/gli/src/org/greenstone/gatherer/cdm/CollectionMeta.java
r6770 r8015 27 27 package org.greenstone.gatherer.cdm; 28 28 29 /**************************************************************************************30 * Written:31 * Revised: 28/06/03 - DOM support32 **************************************************************************************/33 29 import org.greenstone.gatherer.Configuration; 34 30 import org.greenstone.gatherer.Gatherer; … … 37 33 import org.greenstone.gatherer.cdm.DOMProxyListEntry; 38 34 import org.greenstone.gatherer.cdm.Index; 39 import org.greenstone.gatherer.msm.MSMUtils;40 35 import org.greenstone.gatherer.util.Codec; 41 36 import org.greenstone.gatherer.util.StaticStrings; 42 37 import org.greenstone.gatherer.util.Utility; 38 import org.greenstone.gatherer.util.XMLTools; 43 39 import org.w3c.dom.*; 40 41 44 42 /** This class encapsulates a single collection level metadata assignment, which constitutes a name, language and value. 45 43 * @author John Thompson, Greenstone Digital Library, University of Waikato … … 129 127 */ 130 128 public String getValue(boolean text_value) { 131 String raw_value = MSMUtils.getValue(element);129 String raw_value = XMLTools.getValue(element); 132 130 // Decode the raw value depending on whether the user asked for the TEXT or GREENSTONE version 133 131 if(text_value == TEXT) { … … 170 168 public void setValue(String raw_value) { 171 169 // Only raw html text can be given to setValue so we need to encode it 172 MSMUtils.setValue(element, Codec.transform(raw_value, Codec.TEXT_TO_DOM));170 XMLTools.setValue(element, Codec.transform(raw_value, Codec.TEXT_TO_DOM)); 173 171 text = null; // Reset text 174 172 // And determine if this makes the metadata assigned -
trunk/gli/src/org/greenstone/gatherer/cdm/Format.java
r7477 r8015 36 36 import org.greenstone.gatherer.cdm.Classifier; 37 37 import org.greenstone.gatherer.cdm.DOMProxyListEntry; 38 import org.greenstone.gatherer.msm.MSMUtils;39 38 import org.greenstone.gatherer.util.Codec; 39 import org.greenstone.gatherer.util.XMLTools; 40 40 import org.w3c.dom.*; 41 41 … … 238 238 String value = "Error"; 239 239 if(element != null) { 240 value = MSMUtils.getValue(element);240 value = XMLTools.getValue(element); 241 241 // Decode into text 242 242 value = Codec.transform(value, Codec.DOM_TO_TEXT); … … 304 304 value = Codec.transform(value, Codec.TEXT_TO_DOM); 305 305 // Store in DOM 306 MSMUtils.setValue(element, value);306 XMLTools.setValue(element, value); 307 307 text = null; 308 308 } … … 323 323 } 324 324 else { 325 value = MSMUtils.getValue(element);325 value = XMLTools.getValue(element); 326 326 if(value.equalsIgnoreCase(CollectionConfiguration.TRUE_STR) || value.equalsIgnoreCase(CollectionConfiguration.FALSE_STR)) { 327 327 temp.append(value); -
trunk/gli/src/org/greenstone/gatherer/cdm/Index.java
r7624 r8015 34 34 import org.greenstone.gatherer.cdm.DOMProxyListEntry; 35 35 import org.greenstone.gatherer.msm.ElementWrapper; 36 import org.greenstone.gatherer.msm.MSMUtils;37 36 import org.greenstone.gatherer.util.StaticStrings; 38 37 import org.greenstone.gatherer.util.Utility; 38 import org.greenstone.gatherer.util.XMLTools; 39 39 import org.w3c.dom.*; 40 40 … … 264 264 if(element != null && element.getNodeName().equals(CollectionConfiguration.INDEX_DEFAULT_ELEMENT)) { 265 265 // Erase old sources 266 MSMUtils.clear(element);266 XMLTools.clear(element); 267 267 // For each entry in the sources array add a new content element. 268 268 int size = sources.size(); -
trunk/gli/src/org/greenstone/gatherer/cdm/PlugInManager.java
r8002 r8015 48 48 import org.greenstone.gatherer.gui.GComboBox; 49 49 import org.greenstone.gatherer.gui.GLIButton; 50 import org.greenstone.gatherer.msm.MSMUtils;51 50 import org.greenstone.gatherer.util.StaticStrings; 52 51 import org.greenstone.gatherer.util.Utility; 52 import org.greenstone.gatherer.util.XMLTools; 53 53 import org.w3c.dom.*; 54 54 import org.xml.sax.*; 55 55 56 /** This class is for maintaining a list of known plug-ins, and importing new plugins using the parser. */ 56 57 public class PlugInManager … … 490 491 String node_name = node.getNodeName(); 491 492 if (node_name.equalsIgnoreCase("PluginName")) { 492 String name = MSMUtils.getValue(node);493 String name = XMLTools.getValue(node); 493 494 plugin_list[i] = name; 494 495 i++; … … 559 560 node_name = node.getNodeName(); 560 561 if(node_name.equalsIgnoreCase("Name")) { 561 String name = MSMUtils.getValue(node);562 String name = XMLTools.getValue(node); 562 563 // We can save ourselves some processing time if a plugin with this name already exists in our manager. If so retrieve it and return it. 563 564 PlugIn existing = getBasePlugIn(name); … … 568 569 } 569 570 else if(node_name.equalsIgnoreCase("Desc")) { 570 plugin.setDescription( MSMUtils.getValue(node));571 plugin.setDescription(XMLTools.getValue(node)); 571 572 } 572 573 else if(node_name.equalsIgnoreCase(CollectionConfiguration.ABSTRACT_ELEMENT)) { 573 plugin.setIsAbstract( MSMUtils.getValue(node).equalsIgnoreCase(CollectionConfiguration.YES_STR));574 plugin.setIsAbstract(XMLTools.getValue(node).equalsIgnoreCase(CollectionConfiguration.YES_STR)); 574 575 } 575 576 // Parse the multitude of arguments. … … 584 585 node_name = det.getNodeName(); 585 586 if(node_name.equalsIgnoreCase("Name")) { 586 argument.setName( MSMUtils.getValue(det));587 argument.setName(XMLTools.getValue(det)); 587 588 } 588 589 else if(node_name.equalsIgnoreCase("Desc")) { 589 argument.setDescription( MSMUtils.getValue(det));590 argument.setDescription(XMLTools.getValue(det)); 590 591 } 591 592 else if(node_name.equalsIgnoreCase("Type")) { 592 argument.setType( MSMUtils.getValue(det));593 argument.setType(XMLTools.getValue(det)); 593 594 } 594 595 else if(node_name.equalsIgnoreCase("Default")) { 595 argument.setDefaultValue( MSMUtils.getValue(det));596 argument.setDefaultValue(XMLTools.getValue(det)); 596 597 } 597 598 else if(node_name.equalsIgnoreCase("List")) { … … 604 605 node_name = subvalue.getNodeName(); 605 606 if(node_name.equalsIgnoreCase("Name")) { 606 key = MSMUtils.getValue(subvalue);607 key = XMLTools.getValue(subvalue); 607 608 } 608 609 else if(node_name.equalsIgnoreCase("Desc")) { 609 desc = MSMUtils.getValue(subvalue);610 desc = XMLTools.getValue(subvalue); 610 611 } 611 612 } … … 617 618 } 618 619 else if(node_name.equalsIgnoreCase("Required")) { 619 String v = MSMUtils.getValue(det);620 String v = XMLTools.getValue(det); 620 621 if(v != null && v.equalsIgnoreCase("yes")) { 621 622 argument.setRequired(true); … … 623 624 } 624 625 else if(node_name.equals(StaticStrings.RANGE_ELEMENT)) { 625 String range_raw = MSMUtils.getValue(det);626 String range_raw = XMLTools.getValue(det); 626 627 int index = -1; 627 628 if((index = range_raw.indexOf(StaticStrings.COMMA_CHARACTER)) != -1) { -
trunk/gli/src/org/greenstone/gatherer/cdm/Subcollection.java
r7997 r8015 27 27 package org.greenstone.gatherer.cdm; 28 28 29 /**************************************************************************************30 * Written: 03/05/0231 * Revised: 17/11/02 - Commenting32 * 04/07/03 - Completely rewritten to support DOM33 **************************************************************************************/34 29 import org.greenstone.gatherer.Gatherer; 35 30 import org.greenstone.gatherer.cdm.CollectionConfiguration; … … 37 32 import org.greenstone.gatherer.cdm.DOMProxyListEntry; 38 33 import org.greenstone.gatherer.msm.ElementWrapper; 39 import org.greenstone.gatherer.msm.MSMUtils;40 34 import org.greenstone.gatherer.util.StaticStrings; 41 35 import org.greenstone.gatherer.util.Troolean; 36 import org.greenstone.gatherer.util.XMLTools; 42 37 import org.w3c.dom.*; 38 43 39 44 40 /** This class encapsulates one subcollection entry in the collection configuration file. … … 98 94 element.setAttribute(StaticStrings.OPTIONS_ATTRIBUTE, flags); 99 95 element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, (include ? StaticStrings.INCLUDE_STR : StaticStrings.EXCLUDE_STR)); 100 MSMUtils.setValue(element, pattern);96 XMLTools.setValue(element, pattern); 101 97 } 102 98 … … 153 149 public String getPattern() { 154 150 if(pattern == null && element != null) { 155 pattern = MSMUtils.getValue(element);151 pattern = XMLTools.getValue(element); 156 152 } 157 153 return pattern; … … 235 231 if(element != null) { 236 232 // Change element 237 MSMUtils.setValue(element, new_pattern);233 XMLTools.setValue(element, new_pattern); 238 234 pattern = new_pattern; 239 235 text = null; -
trunk/gli/src/org/greenstone/gatherer/cdm/SubcollectionIndex.java
r5590 r8015 27 27 package org.greenstone.gatherer.cdm; 28 28 29 /**************************************************************************************30 * Written: 04/07/0331 * Revised:32 **************************************************************************************/33 29 import java.util.*; 34 30 import org.greenstone.gatherer.Gatherer; … … 37 33 import org.greenstone.gatherer.cdm.CollectionMeta; 38 34 import org.greenstone.gatherer.cdm.DOMProxyListEntry; 39 import org.greenstone.gatherer.msm.MSMUtils;40 35 import org.greenstone.gatherer.util.StaticStrings; 41 36 import org.greenstone.gatherer.util.Utility; 37 import org.greenstone.gatherer.util.XMLTools; 42 38 import org.w3c.dom.*; 43 39 … … 164 160 if(element != null) { 165 161 // Erase old sources 166 MSMUtils.clear(element);162 XMLTools.clear(element); 167 163 // For each entry in the sources array add a new content element. 168 164 int size = sources.size(); -
trunk/gli/src/org/greenstone/gatherer/cdm/SubcollectionManager.java
r8002 r8015 47 47 import org.greenstone.gatherer.gui.NonWhitespaceField; 48 48 import org.greenstone.gatherer.msm.ElementWrapper; 49 import org.greenstone.gatherer.msm.MSMUtils;50 49 import org.greenstone.gatherer.util.ExclusiveListSelectionListener; 51 50 import org.greenstone.gatherer.util.StaticStrings; … … 403 402 ElementWrapper element_wrapper = (ElementWrapper)object; 404 403 source = element_wrapper.getName(); 405 if(source.indexOf( MSMUtils.NS_SEP) == -1) {404 if(source.indexOf(StaticStrings.NS_SEP) == -1) { 406 405 source = StaticStrings.EXTRACTED_NAMESPACE + source; 407 406 } … … 489 488 ElementWrapper element_wrapper = (ElementWrapper)object; 490 489 source = element_wrapper.getName(); 491 if(source.indexOf( MSMUtils.NS_SEP) == -1) {490 if(source.indexOf(StaticStrings.NS_SEP) == -1) { 492 491 source = StaticStrings.EXTRACTED_NAMESPACE + source; 493 492 } … … 529 528 ElementWrapper e = (ElementWrapper) value; 530 529 String e_name = e.getName(); 531 if(e_name.indexOf( MSMUtils.NS_SEP) == -1) {530 if(e_name.indexOf(StaticStrings.NS_SEP) == -1) { 532 531 e_name = StaticStrings.EXTRACTED_NAMESPACE + e_name; 533 532 } -
trunk/gli/src/org/greenstone/gatherer/collection/BuildOptions.java
r7739 r8015 8 8 import org.greenstone.gatherer.Gatherer; 9 9 import org.greenstone.gatherer.cdm.Argument; 10 import org.greenstone.gatherer.msm.MSMUtils;11 10 import org.greenstone.gatherer.util.ArrayTools; 12 11 import org.greenstone.gatherer.util.Codec; 13 12 import org.greenstone.gatherer.util.StaticStrings; 14 13 import org.greenstone.gatherer.util.Utility; 14 import org.greenstone.gatherer.util.XMLTools; 15 15 import org.w3c.dom.*; 16 16 import org.xml.sax.InputSource; … … 102 102 Element argument = (Element) argument_list.item(i); 103 103 ArrayTools.add(arguments, argument.getAttribute(NAME)); 104 String value = MSMUtils.getValue(argument);104 String value = XMLTools.getValue(argument); 105 105 if(value != null && value.length() > 0) { 106 106 ArrayTools.add(arguments, value); … … 229 229 String node_name = node.getNodeName(); 230 230 if(node_name.equals("Name")) { 231 argument.setName( MSMUtils.getValue(node));231 argument.setName(XMLTools.getValue(node)); 232 232 } 233 233 else if(node_name.equals("Desc")) { 234 argument.setDescription( MSMUtils.getValue(node));234 argument.setDescription(XMLTools.getValue(node)); 235 235 } 236 236 else if(node_name.equals("Type")) { 237 argument.setType( MSMUtils.getValue(node));237 argument.setType(XMLTools.getValue(node)); 238 238 } 239 239 else if(node_name.equals("Default")) { 240 argument.setDefaultValue( MSMUtils.getValue(node));240 argument.setDefaultValue(XMLTools.getValue(node)); 241 241 } 242 242 else if(node_name.equals("List")) { … … 249 249 node_name = subvalue.getNodeName(); 250 250 if(node_name.equals("Name")) { 251 key = MSMUtils.getValue(subvalue);251 key = XMLTools.getValue(subvalue); 252 252 } 253 253 else if(node_name.equals("Desc")) { 254 desc = MSMUtils.getValue(subvalue);254 desc = XMLTools.getValue(subvalue); 255 255 } 256 256 } … … 262 262 } 263 263 else if(node_name.equals("Required")) { 264 String v = MSMUtils.getValue(node);264 String v = XMLTools.getValue(node); 265 265 if(v != null && v.equals("yes")) { 266 266 argument.setRequired(true); … … 268 268 } 269 269 else if(node_name.equals(StaticStrings.RANGE_ELEMENT)) { 270 String range_raw = MSMUtils.getValue(node);270 String range_raw = XMLTools.getValue(node); 271 271 int comma_index = -1; 272 272 if((comma_index = range_raw.indexOf(StaticStrings.COMMA_CHARACTER)) != -1) { … … 298 298 } 299 299 else if(node_name.equals(StaticStrings.MODEGLI_ELEMENT)) { 300 String mode_level_str = MSMUtils.getValue(node);300 String mode_level_str = XMLTools.getValue(node); 301 301 try { 302 302 int mode_level = Integer.parseInt(mode_level_str); … … 331 331 } 332 332 else { 333 String argument_value = MSMUtils.getValue(argument_element);333 String argument_value = XMLTools.getValue(argument_element); 334 334 if(argument_value != null) { 335 335 result = argument_value; … … 359 359 values.add("-" + argument_element.getAttribute(NAME)); 360 360 // Now retrieve the value. 361 String argument_value = Codec.transform( MSMUtils.getValue(argument_element), Codec.DOM_TO_TEXT);361 String argument_value = Codec.transform(XMLTools.getValue(argument_element), Codec.DOM_TO_TEXT); 362 362 // If there is a value, tokenize it by commas only. 363 363 if(argument_value != null && argument_value.length() > 0) { -
trunk/gli/src/org/greenstone/gatherer/collection/Collection.java
r7989 r8015 51 51 import org.greenstone.gatherer.msm.MetadataXMLFileManager; 52 52 import org.greenstone.gatherer.msm.MetadataSetManager; 53 import org.greenstone.gatherer.msm.MSMUtils;54 53 import org.greenstone.gatherer.util.StaticStrings; 55 54 import org.greenstone.gatherer.util.Utility; 55 import org.greenstone.gatherer.util.XMLTools; 56 56 import org.w3c.dom.*; 57 57 … … 246 246 if(argument_element.getParentNode() == document_element) { 247 247 if(argument_element.getAttribute(StaticStrings.NAME_ATTRIBUTE).equalsIgnoreCase(name)) { 248 String value = MSMUtils.getValue(argument_element);248 String value = XMLTools.getValue(argument_element); 249 249 if(value.equalsIgnoreCase(StaticStrings.TRUE_STR)) { 250 250 result = true; … … 276 276 if(argument_element.getParentNode() == document_element) { 277 277 if(argument_element.getAttribute(StaticStrings.NAME_ATTRIBUTE).equalsIgnoreCase(name)) { 278 result = MSMUtils.getValue(argument_element);278 result = XMLTools.getValue(argument_element); 279 279 found = true; 280 280 } … … 296 296 try { 297 297 Element document_element = document.getDocumentElement(); 298 Element build_config_element = (Element) MSMUtils.getNodeFromNamed(document_element, BUILD_CONFIG);299 build_values_element = (Element) MSMUtils.getNodeFromNamed(build_config_element, BUILD);298 Element build_config_element = (Element) XMLTools.getNodeFromNamed(document_element, BUILD_CONFIG); 299 build_values_element = (Element) XMLTools.getNodeFromNamed(build_config_element, BUILD); 300 300 build_config_element = null; 301 301 document_element = null; … … 328 328 try { 329 329 Element document_element = document.getDocumentElement(); 330 Element build_config_element = (Element) MSMUtils.getNodeFromNamed(document_element, BUILD_CONFIG);331 import_values_element = (Element) MSMUtils.getNodeFromNamed(build_config_element, IMPORT);330 Element build_config_element = (Element) XMLTools.getNodeFromNamed(document_element, BUILD_CONFIG); 331 import_values_element = (Element) XMLTools.getNodeFromNamed(build_config_element, IMPORT); 332 332 build_config_element = null; 333 333 document_element = null; -
trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java
r7980 r8015 71 71 import org.greenstone.gatherer.msm.MSMListener; 72 72 import org.greenstone.gatherer.msm.MSMProfiler; 73 import org.greenstone.gatherer.msm.MSMUtils;74 73 import org.greenstone.gatherer.shell.GShell; 75 74 import org.greenstone.gatherer.shell.GShellEvent; … … 83 82 import org.greenstone.gatherer.util.SynchronizedTreeModelTools; 84 83 import org.greenstone.gatherer.util.Utility; 84 import org.greenstone.gatherer.util.XMLTools; 85 85 import org.w3c.dom.*; 86 86 … … 537 537 Document default_lockfile = Utility.parse("xml/" + LOCK_FILE, true); 538 538 String user_name = System.getProperty("user.name"); 539 Element person_element = (Element) MSMUtils.getNodeFromNamed(default_lockfile.getDocumentElement(), "User");539 Element person_element = (Element) XMLTools.getNodeFromNamed(default_lockfile.getDocumentElement(), "User"); 540 540 person_element.appendChild(default_lockfile.createTextNode(user_name)); 541 541 person_element = null; 542 542 user_name = null; 543 543 String machine_name = Utility.getMachineName(); 544 Element machine_element = (Element) MSMUtils.getNodeFromNamed(default_lockfile.getDocumentElement(), "Machine");544 Element machine_element = (Element) XMLTools.getNodeFromNamed(default_lockfile.getDocumentElement(), "Machine"); 545 545 machine_element.appendChild(default_lockfile.createTextNode(machine_name)); 546 546 machine_element = null; 547 547 machine_name = null; 548 548 String date_time = Utility.getDateString(); 549 Element date_element = (Element) MSMUtils.getNodeFromNamed(default_lockfile.getDocumentElement(), "Date");549 Element date_element = (Element) XMLTools.getNodeFromNamed(default_lockfile.getDocumentElement(), "Date"); 550 550 date_element.appendChild(default_lockfile.createTextNode(date_time)); 551 551 date_element = null; -
trunk/gli/src/org/greenstone/gatherer/file/FileAssociationManager.java
r7540 r8015 33 33 import org.greenstone.gatherer.gui.FileAssociationDialog; 34 34 import org.greenstone.gatherer.gui.PreviewCommandDialog; 35 import org.greenstone.gatherer.msm.MSMUtils;36 35 import org.greenstone.gatherer.util.ExternalProgram; 37 36 import org.greenstone.gatherer.util.StaticStrings; 38 37 import org.greenstone.gatherer.util.Utility; 38 import org.greenstone.gatherer.util.XMLTools; 39 39 import org.w3c.dom.*; 40 40 … … 57 57 for(int i = 0; i < entries.getLength(); i++) { 58 58 Element entry = (Element) entries.item(i); 59 String command = MSMUtils.getValue(entry);59 String command = XMLTools.getValue(entry); 60 60 // If we encounter a command of ""... 61 61 if(command.length() == 0) { … … 63 63 if(Utility.isWindows()) { 64 64 if (Utility.isWindows9x()) { 65 MSMUtils.setValue(entry, StaticStrings.WIN_9X_OPEN_COMMAND);65 XMLTools.setValue(entry, StaticStrings.WIN_9X_OPEN_COMMAND); 66 66 } else { 67 MSMUtils.setValue(entry, StaticStrings.WIN_OPEN_COMMAND);67 XMLTools.setValue(entry, StaticStrings.WIN_OPEN_COMMAND); 68 68 } 69 69 } 70 70 // and if we are on mac, we default to the open program 71 71 else if(Utility.isMac()) { 72 MSMUtils.setValue(entry, StaticStrings.MAC_OPEN_COMMAND);72 XMLTools.setValue(entry, StaticStrings.MAC_OPEN_COMMAND); 73 73 } 74 74 } … … 169 169 if(entry != null) { 170 170 ///ystem.err.println("Retrieved Value From Cache"); 171 command = MSMUtils.getValue(entry);171 command = XMLTools.getValue(entry); 172 172 } 173 173 if(command == null || command.length() == 0) { … … 206 206 } 207 207 // Replace the text in this node. Remember to replace the dummy filename with %1 - I dont think the filename will ever be in the comand now 208 // MSMUtils.setValue(entry, command.replaceAll(filename, FILENAME_ARG));209 MSMUtils.setValue(entry, command);208 //XMLTools.setValue(entry, command.replaceAll(filename, FILENAME_ARG)); 209 XMLTools.setValue(entry, command); 210 210 } 211 211 } … … 245 245 Element entry = getCommand(target_extension); 246 246 if(entry != null) { 247 return MSMUtils.getValue(entry);247 return XMLTools.getValue(entry); 248 248 } 249 249 else { … … 291 291 if(command != null) { 292 292 // Replace the text in this node. If the user has used filename instead of %1 then too bad. 293 MSMUtils.setValue(entry, command);293 XMLTools.setValue(entry, command); 294 294 } 295 295 else { -
trunk/gli/src/org/greenstone/gatherer/gui/LockFileDialog.java
r6318 r8015 46 46 import org.greenstone.gatherer.gui.SimpleMenuBar; 47 47 import org.greenstone.gatherer.gui.ModalDialog; 48 import org.greenstone.gatherer.msm.MSMUtils;49 48 import org.greenstone.gatherer.util.Utility; 49 import org.greenstone.gatherer.util.XMLTools; 50 50 import org.w3c.dom.*; 51 51 … … 204 204 if(document != null) { 205 205 try { 206 Element value_element = (Element) MSMUtils.getNodeFromNamed(document.getDocumentElement(), name);207 value = MSMUtils.getValue(value_element);206 Element value_element = (Element) XMLTools.getNodeFromNamed(document.getDocumentElement(), name); 207 value = XMLTools.getValue(value_element); 208 208 } 209 209 catch (Exception error) { -
trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java
r7545 r8015 37 37 static final public char FORWARDSLASH_CHAR = '/'; 38 38 static final public char NEW_LINE_CHAR = '\n'; 39 static final public char NS_SEP = '.'; 39 40 static final public char OPENBRACKET_CHAR = '['; 40 41 static final public char PIPE_CHAR = '|'; -
trunk/gli/src/org/greenstone/gatherer/util/XMLTools.java
r8014 r8015 13 13 public class XMLTools 14 14 { 15 /** Remove all of the child nodes from a certain node. */ 16 static final public void clear(Node node) 17 { 18 while (node.hasChildNodes()) { 19 node.removeChild(node.getFirstChild()); 20 } 21 } 22 23 15 24 static public ArrayList getChildElementsByTagName(Element parent_element, String element_name) 16 25 { … … 88 97 89 98 99 /** Set the #text node value of some element. 100 * @param element the Element whose value we wish to set 101 * @param value the new value for the element as a String 102 * Soon to be deprecated! 103 */ 104 static final public void setValue(Element element, String value) { 105 // Remove any existing child node(s) 106 clear(element); 107 // Add new text node. 108 if (value != null) { 109 element.appendChild(element.getOwnerDocument().createTextNode(value)); 110 } 111 } 112 113 90 114 /** Parse an XML document from a given file */ 91 115 static public Document parseXMLFile(File xml_file)
Note:
See TracChangeset
for help on using the changeset viewer.