Changeset 8236 for trunk/gli/src/org/greenstone/gatherer/msm/MetadataXMLFile.java

Timestamp:

2004-10-08T09:46:12+13:00 (20 years ago)

Author:

mdewsnip

Message:

Replaced all Gatherer.print* with DebugStream.print*.

File:

• trunk/gli/src/org/greenstone/gatherer/msm/MetadataXMLFile.java (modified) (12 diffs)

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

@@ -29 +29 @@
 import java.io.*;
 import java.util.*;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.msm.MetadataXMLFileManager;
@@ -184 +185 @@
     }
     catch (Exception error) {
-        Gatherer.printStackTrace(error);
+        DebugStream.printStackTrace(error);
     }
     }
@@ -190 +191 @@
     /** this is used to 'purge' the metadata - I've taken the purge code out of getMetadata and put it in to here, cos its only called from one place and we dont want to retrieve the metadata, just update it */
     public void cleanUpMetadataRefs() {
-    //Gatherer.println("clean up metadata refs!");
+    //DebugStream.println("clean up metadata refs!");
 
     String file_relative_path = "";
@@ -208 +209 @@
             // If this raw_value contains a '\' character, but no '\\', '[' or ']' characters, then replace the '\' with a '\\'
             if(raw_value.indexOf(StaticStrings.ESCAPE_STR) != -1) {
-            Gatherer.println("Detected Legacy Path: " + raw_value);
+            DebugStream.println("Detected Legacy Path: " + raw_value);
             raw_value = raw_value.replaceAll(StaticStrings.ESCAPE_PATTERN, StaticStrings.PIPE_STR);
             MSMUtils.setValue(metadata_element, raw_value);
@@ -231 +232 @@
         metadata_elements = null;
         } // for each metadata type
-    } catch (Exception error) {
-        Gatherer.self.printStackTrace(error);
+    } catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
     }
     }
@@ -279 +280 @@
     // Kath has cleaned up this version a bit
     public ArrayList getMetadata(String filename, boolean remove, ArrayList metadatum_so_far, File file, boolean append_folder_level) {
-    Gatherer.println("Get metadata for " + filename);
-    Gatherer.println("remove = " + remove + ", metadata_so_far = " + (metadatum_so_far != null ? String.valueOf(metadatum_so_far.size()) : "null") + ", file = " + file + ", append_folder_level = " + append_folder_level);
+    DebugStream.println("Get metadata for " + filename);
+    DebugStream.println("remove = " + remove + ", metadata_so_far = " + (metadatum_so_far != null ? String.valueOf(metadatum_so_far.size()) : "null") + ", file = " + file + ", append_folder_level = " + append_folder_level);
 
     // Determine the file's path relative to the location of the metadata.xml file
@@ -335 +336 @@
             // If this raw_value contains a '\' character, but no '\\', '[' or ']' characters, then replace the '\' with a '\\'
             if(raw_value.indexOf(StaticStrings.ESCAPE_STR) != -1) {
-                Gatherer.println("Detected Legacy Path: " + raw_value);
+                DebugStream.println("Detected Legacy Path: " + raw_value);
                 raw_value = raw_value.replaceAll(StaticStrings.ESCAPE_PATTERN, StaticStrings.PIPE_STR);
-                Gatherer.println("Updated Path To: " + raw_value);
+                DebugStream.println("Updated Path To: " + raw_value);
                 MSMUtils.setValue(metadata_element, raw_value);
             }
@@ -454 +455 @@
         directorymetadata_element = null;
     }
-    catch (Exception error) {
-        Gatherer.self.printStackTrace(error);
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
     }
     ///ystem.err.println("Found " + metadatum.size() + " pieces of metadata.");
@@ -480 +481 @@
     }
     catch (Exception error) {
-        Gatherer.printStackTrace(error);
+        DebugStream.printStackTrace(error);
     }
     return has_meta;
@@ -523 +524 @@
     }
     catch(Exception exception) {
-        Gatherer.println("Exception in MetadataXMLFile.removeExtractedMetadata() - unexpected");
-        Gatherer.printStackTrace(exception);
+        DebugStream.println("Exception in MetadataXMLFile.removeExtractedMetadata() - unexpected");
+        DebugStream.printStackTrace(exception);
     }
     }
@@ -530 +531 @@
     /** Remove the given metadata from this document.If filename is null, then removes directory level metadata, otherwise just removes it from the specified file. All directory level metadata is available under the FileSet with filename '.*'. There is at least one nasty case to consider, where the first overwriting metadata entry, of several with the same element, is removed. In this case the next entry must become overwrite to ensure proper inheritance. */
     public void removeMetadata(String filename, Metadata metadata) {
-    Gatherer.println("Remove metadata: " + metadata + "\nFrom filename: " + filename);
+    DebugStream.println("Remove metadata: " + metadata + "\nFrom filename: " + filename);
     try {
         boolean found = false;
@@ -619 +620 @@
     }
     catch (Exception error) {
-        Gatherer.printStackTrace(error);
+        DebugStream.printStackTrace(error);
     }
     }