Changeset 4086

Timestamp:

2003-04-03T12:32:25+12:00 (21 years ago)

Author:

kjdon

Message:

now reads in the config files using utf-8 rather than the default encoding which is ISO8859_1 on my machine

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3/collection

Files:

• Collection.java (modified) (1 diff)
• ServiceCluster.java (modified) (2 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/collection/Collection.java

@@ -96 +96 @@
     
     // get the xml for both files
-    Element coll_config_xml = converter_.getDOM(coll_config_file).getDocumentElement();
-    Element build_config_xml = converter_.getDOM(build_config_file).getDocumentElement();
+    Element coll_config_xml = converter_.getDOM(coll_config_file, CONFIG_ENCODING).getDocumentElement();
+    Element build_config_xml = converter_.getDOM(build_config_file, CONFIG_ENCODING).getDocumentElement();
     
     // process the metadata

trunk/gsdl3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java

@@ -45 +45 @@
     implements ModuleInterface {
 
+    protected static final String CONFIG_ENCODING = "utf-8";
 
     /** base directory for the site that this cluster belongs to*/
@@ -133 +134 @@
     }
 
-    Document doc = converter_.getDOM(config_file_);
+    Document doc = converter_.getDOM(config_file_, CONFIG_ENCODING);
     
     // get the appropriate service cluster element