Changeset 7744

Timestamp:

2004-07-16T14:03:57+12:00 (20 years ago)

Author:

davidb

Message:

Look for data in resource (Jar) file before local file system.
Needed when GLI run as applet.

Location:

trunk/gli/src/org/greenstone/gatherer/msm

Files:

• MetadataSet.java (modified) (4 diffs)
• MetadataXMLFileManager.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/msm/MetadataSet.java

@@ -77 +77 @@
 
     public MetadataSet(String metadata_template) {
-    URL url = ClassLoader.getSystemResource(metadata_template);
-    try {
-        init(new File(URLDecoder.decode(url.getFile(), "UTF-8")));
-    }
-    catch(UnsupportedEncodingException exception) {
-        Gatherer.printStackTrace(exception);
-    }
+    
+    this.file = new File(metadata_template);
+    this.value_trees = new Hashtable();
+    this.document = Utility.parse(metadata_template, true);
+
+    init(true); // use class loader
     }
 
@@ -90 +89 @@
      */
     public MetadataSet(File file) {
-    init(file);
+    this.file = file;
+    this.value_trees = new Hashtable();
+    this.document = Utility.parse(file, false);
+
+    init(false); // don't use class loader
     }
 
@@ -583 +586 @@
     }
 
-    private void init(File file) {
-    this.file = file;
-    this.value_trees = new Hashtable();
-    this.document = Utility.parse(file, false);
-    if(document != null) {
+    private void init(boolean use_classloader) {
+
+    if(this.document != null) {
         this.elements = document.getElementsByTagName("Element");
         this.root = document.getDocumentElement();
@@ -596 +597 @@
         ///ystem.err.println("Searching for " + value_file.getAbsolutePath());
         if(value_file.exists()) {
-            Document value_document = Utility.parse(value_file, false);
+            Document value_document;
+            if (use_classloader) {
+            value_document = Utility.parse(value_file.toString(), true);
+            }
+            else {
+            value_document = Utility.parse(value_file, false);
+            }
             if(value_document != null) {
             value_trees.put(value_element, new GValueModel(value_element, value_document));

trunk/gli/src/org/greenstone/gatherer/msm/MetadataXMLFileManager.java

@@ -335 +335 @@
      */
     public synchronized void metadataChanged(MSMEvent event) {
-    // System.err.println("In MetadataXMLFileManager::metadataChanged(" + event + ")...");
+    // System.err.println("In MetadataXMLFileManager::metadataChanged(" + event + ")...");  
+
     File file = event.getFile();
     if(file == null) {
@@ -361 +362 @@
         if(new_metadata != null) {
         // File level
+        
+        String filename = file.toString();
+        if (!filename.startsWith(File.separator)) {
+            String collection_dir = Utility.getCollectionDir();
+            File full_file = new File(collection_dir + filename);
+            file = full_file;
+        }
+
         if(file.isFile()) {
             // System.err.println("Calling metadata_xml.addMetadata(" + new_metadata + ")...");