Changeset 8236 for trunk/gli/src/org/greenstone/gatherer/msm

Timestamp:

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

Author:

mdewsnip

Message:

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

Location:

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

Files:

• ExistingMetadataLoader.java (modified) (3 diffs)
• GreenstoneArchiveParser.java (modified) (3 diffs)
• LegacyCollectionImporter.java (modified) (2 diffs)
• MSMProfiler.java (modified) (5 diffs)
• MetadataSet.java (modified) (4 diffs)
• MetadataSetManager.java (modified) (3 diffs)
• MetadataXMLFile.java (modified) (12 diffs)
• MetadataXMLFileManager.java (modified) (6 diffs)
• parsers/GreenstoneMetadataParser.java (modified) (10 diffs)

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

@@ -40 +40 @@
 import java.util.*;
 import java.util.jar.*;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.file.FileNode;
@@ -66 +67 @@
         name = name.substring(0, name.length() - 6);
         load_these.add("org.greenstone.gatherer.msm.parsers." + name);
-        Gatherer.println("Loaded metadata parser: " + name);
+        DebugStream.println("Loaded metadata parser: " + name);
         }
         name = null;
@@ -85 +86 @@
             if(!load_these.contains(name)) {
                 load_these.add(name);
-                Gatherer.println("Loaded metadata parser: " + name);
+                DebugStream.println("Loaded metadata parser: " + name);
             }
             }                       

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

@@ -41 +41 @@
 import java.util.*;
 import org.greenstone.gatherer.Configuration;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -208 +209 @@
     }
     catch (UnsupportedEncodingException error) {
-        Gatherer.printStackTrace(error);
+        DebugStream.printStackTrace(error);
     }
 
@@ -269 +270 @@
             }
             catch (Exception error) {
-            Gatherer.printStackTrace(error);
+            DebugStream.printStackTrace(error);
             }
         }

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

@@ -31 +31 @@
 import java.util.*;
 import org.w3c.dom.*;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.Argument;
@@ -132 +133 @@
         }
         catch (Exception e) {
-        Gatherer.println("Exception: couldn't move the file " + meta_file.getPath() + e.getMessage());
+        DebugStream.println("Exception: couldn't move the file " + meta_file.getPath() + e.getMessage());
         }
     }

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

@@ -39 +39 @@
 import java.io.*;
 import java.util.*;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.msm.MSMAdapter;
@@ -112 +113 @@
      */
     public void elementChanged(MSMEvent event) {
-    Gatherer.println("Element changed: " + event);
+    DebugStream.println("Element changed: " + event);
     String new_name = null;
     String old_name = event.getValue();
@@ -207 +208 @@
         backup.deleteOnExit();
         if(!profile_file.renameTo(backup)) {
-            Gatherer.println("Error in MSMProfiler.save(): FileRenamedException");
+            DebugStream.println("Error in MSMProfiler.save(): FileRenamedException");
         }
         backup = null;
@@ -215 +216 @@
         Document document = Utility.parse(Utility.PROFILE_TEMPLATE, true);
         if(document == null) {
-        Gatherer.println("Error in MSMProfiler.save(): couldn't find and parse the profile template file!");
+        DebugStream.println("Error in MSMProfiler.save(): couldn't find and parse the profile template file!");
         return;
         }
@@ -249 +250 @@
     }
     catch (Exception error) {
-        Gatherer.printStackTrace(error);
+        DebugStream.printStackTrace(error);
     }
     }

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

@@ -42 +42 @@
 import org.apache.xerces.dom.*;
 import org.greenstone.gatherer.Configuration;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -345 +346 @@
 
     public Element getElement(Element parent_element, String name) {
-    Gatherer.println("Get element named " + name + " from " + parent_element.getAttribute("name"));
+    DebugStream.println("Get element named " + name + " from " + parent_element.getAttribute("name"));
     NodeList elements = parent_element.getElementsByTagName("Element");
     for(int i = 0; i < elements.getLength(); i++) {
@@ -609 +610 @@
             }
             else {
-            Gatherer.println("Error! Missing mdv file: " + value_file.getAbsolutePath());
+            DebugStream.println("Error! Missing mdv file: " + value_file.getAbsolutePath());
             }
         }
@@ -615 +616 @@
     }
     else {
-        Gatherer.println("Error! Missing mds file: " + file.getAbsolutePath());
+        DebugStream.println("Error! Missing mds file: " + file.getAbsolutePath());
     }
     }

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

@@ -43 +43 @@
 import javax.swing.tree.TreePath;
 import org.greenstone.gatherer.Configuration;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -927 +928 @@
     File file = new File(Gatherer.self.getCollectionMetadata());
     if (!file.exists()) {
-        Gatherer.println("trying to save a collection and the metadata directory does not exist - creating it!");
+        DebugStream.println("trying to save a collection and the metadata directory does not exist - creating it!");
         file.mkdir();
     }
@@ -937 +938 @@
         backup.deleteOnExit();
         if(!temp[i].renameTo(backup)) {
-            Gatherer.println("Error in MetadataSetManager.save(): FileRenamedException");
+            DebugStream.println("Error in MetadataSetManager.save(): FileRenamedException");
         }
         }

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);
     }
     }

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

@@ -44 +44 @@
 import javax.swing.event.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.file.FileNode;
@@ -83 +84 @@
     Gatherer.c_man.getCollection().msm.addMSMListener(this);
     // We also have a debug dialog
-    if(Gatherer.debug != null) {
+    if (DebugStream.isDebuggingEnabled()) {
         display();
     }
@@ -213 +214 @@
         documents_in_cache_combobox.addItem(metadata_file);
         }
-        //Gatherer.println("[0ms]\tCached " + metadata_file);
+        //DebugStream.println("[0ms]\tCached " + metadata_file);
     }
     return metadata_xml;
@@ -388 +389 @@
     }
     catch (Exception exception) {
-        Gatherer.println("Exception in MetadataXMLFileManager.removeExtractedMetadata - unexpected");
-        Gatherer.printStackTrace(exception);
+        DebugStream.println("Exception in MetadataXMLFileManager.removeExtractedMetadata - unexpected");
+        DebugStream.printStackTrace(exception);
     }
     }
@@ -491 +492 @@
     private Metadata checkCache(Metadata metadata)
     {
-    Gatherer.println("Checking cache for " + metadata + "...");
+    DebugStream.println("Checking cache for " + metadata + "...");
 
     if (metadata == null) {
@@ -501 +502 @@
     if (metadata_cache.contains(element_name, metadata.getValue())) {
         // If so, return the cached metadata value
-        Gatherer.println("In cache!");
+        DebugStream.println("In cache!");
         return (Metadata) metadata_cache.get(element_name, metadata.getValue());
     }

trunk/gli/src/org/greenstone/gatherer/msm/parsers/GreenstoneMetadataParser.java

@@ -39 +39 @@
 import javax.swing.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.CommandTokenizer;
@@ -93 +94 @@
     /** Locate and import any metadata parsed by this metadata parser given the file involved and its previous incarnation. */
     public boolean process(FileNode destination, FileNode origin, boolean folder_level, boolean dummy_run) {
-    Gatherer.println("GreenstoneMetadataParser: Process " + origin + ": ");
+    DebugStream.println("GreenstoneMetadataParser: Process " + origin + ": ");
     int counter = 0;
     dialog_cancelled = false;
@@ -114 +115 @@
         if(possible_cfg_file.exists() && (possible_gimport_directory.exists() || possible_import_directory.exists())) {
         found = true;
-        Gatherer.println("Found greenstone collection at " + collection_dir.getAbsolutePath());
+        DebugStream.println("Found greenstone collection at " + collection_dir.getAbsolutePath());
         }
         else {
@@ -131 +132 @@
 
     // 2. If a collection configuration file was found, attempt to merge in any mdses and make note of those that are successfully imported (by removing reference from collect.cfg).
-    Gatherer.println("Merging in any metadata sets found.");
+    DebugStream.println("Merging in any metadata sets found.");
     if(collect_cfg != null) {
         ArrayList mdses = collect_cfg.getMetadataSets();
@@ -143 +144 @@
 
     // 3. Locate all of the metadata.xml files that may have an affect on the origin file. Make sure the metadata.xml closest to the origin files directory is last (to ensure property inheritance regarding accumulate/overwrite).
-    Gatherer.println("Searching for metadata.xml files");
+    DebugStream.println("Searching for metadata.xml files");
     ArrayList search_files = new ArrayList();
     File file = origin.getFile();
@@ -176 +177 @@
     for(int i = 0; i < search_files.size(); i++) {
         MetadataXMLFileSearch a_search = (MetadataXMLFileSearch) search_files.get(i);
-        Gatherer.println("Search " + a_search.file.getAbsolutePath() + " for " + (a_search.filename != null ? a_search.filename : ".*"));
-        Gatherer.println("Search at the " + (folder_level ? "Folder" : "Filename") + " level");
+        DebugStream.println("Search " + a_search.file.getAbsolutePath() + " for " + (a_search.filename != null ? a_search.filename : ".*"));
+        DebugStream.println("Search at the " + (folder_level ? "Folder" : "Filename") + " level");
         // Retrieve the document
         BasicGDMDocument document = getDocument(a_search.file);
@@ -194 +195 @@
     search_files = null;
     // Finally assign the metadata
-    Gatherer.println("Found " + metadata.size() + " pieces of metadata for " + destination);
+    DebugStream.println("Found " + metadata.size() + " pieces of metadata for " + destination);
     if(metadata.size() > 0) {
         addMetadata(origin, destination, metadata, collection_dir, collect_cfg, dummy_run);
@@ -493 +494 @@
         directorymetadata_element = null;
         }
-        catch (Exception error) {
-        Gatherer.self.printStackTrace(error);
+        catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
         }
         return metadatum;
@@ -583 +584 @@
             directorymetadata_element = null;
         }
-        catch (Exception error) {
-            Gatherer.self.printStackTrace(error);
+        catch (Exception exception) {
+            DebugStream.printStackTrace(exception);
         }
         // Cache the result, given that these external metadata.xmls are taken to be static at the time of reading (if you happen to be sourcing information from a opened collection that someone is working on, too bad.
@@ -703 +704 @@
         }
         catch(Exception error) {
-            Gatherer.printStackTrace(error);
+            DebugStream.printStackTrace(error);
             collect_cfg = null;
         }