Changeset 8165

Timestamp:

2004-09-28T11:21:29+12:00 (20 years ago)

Author:

mdewsnip

Message:

Removed some debug statements and made others go to the debug stream.

Location:

trunk/gli/src/org/greenstone/gatherer/metadata

Files:

• DocXMLFile.java (modified) (4 diffs)
• MetadataAuditTableModel.java (modified) (1 diff)
• MetadataSetManager.java (modified) (1 diff)
• MetadataValueTableModel.java (modified) (1 diff)
• MetadataXMLFile.java (modified) (3 diffs)
• MetadataXMLFileManager.java (modified) (6 diffs)

trunk/gli/src/org/greenstone/gatherer/metadata/DocXMLFile.java

@@ -30 +30 @@
 import java.io.*;
 import java.util.*;
+import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.util.XMLTools;
@@ -79 +80 @@
 
     // Parse the doc.xml file
-    System.err.println("Applicable doc.xml file: " + this);
+    Gatherer.println("Applicable doc.xml file: " + this);
     Document document = XMLTools.parseXMLFile(this);
     if (document == null) {
@@ -159 +160 @@
 
     // Skim the doc.xml file as quickly as possible (don't parse as XML), looking at the Metadata elements
-    System.err.println("Skimming doc.xml file " + this + "...");
+    Gatherer.println("Skimming doc.xml file " + this + "...");
     try {
         BufferedReader buffered_reader = new BufferedReader(new FileReader(this));
@@ -230 +231 @@
         if (metadata_element == null) {
             // This element isn't defined in ex.mds, so create it for this session
-            System.err.println("Extracted metadata element not defined: " + metadata_element_name);
+            Gatherer.println("Extracted metadata element not defined: " + metadata_element_name);
             extracted_metadata_set.addMetadataElementForThisSession(metadata_element_name);
         }

trunk/gli/src/org/greenstone/gatherer/metadata/MetadataAuditTableModel.java

@@ -99 +99 @@
     private class MetadataAuditTableModelBuilder
     {
+    // Build a list of MetadataAuditTableEntries that represent the metadata asssigned to the selected files
     public void run()
     {
-        // Build a list of MetadataAuditTableEntries that represent the metadata asssigned to the selected files
-        System.err.println("Building MetadataAuditTableModel...");
-
         // Process each of the selected files in turn
         for (int i = 0; i < file_nodes.length; i++) {
         File current_file = file_nodes[i].getFile();
-        System.err.println("  File: " + current_file);
 
         // Get the metadata assigned to this file

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

@@ -84 +84 @@
 
     // Not found
-    // System.err.println("No metadata set with namespace \"" + metadata_set_namespace + "\" found.");
     return null;
     }

trunk/gli/src/org/greenstone/gatherer/metadata/MetadataValueTableModel.java

@@ -131 +131 @@
     metadata_value_table_entries.clear();
 
+    // Collection is in a state of flux
     if (!Gatherer.c_man.ready()) {
-        System.err.println("Not ready!");
         return;
     }

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

@@ -30 +30 @@
 import java.io.*;
 import java.util.*;
+import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.util.XMLTools;
 import org.w3c.dom.*;
@@ -230 +231 @@
         // If there is no metadata value tree node for this value, create it
         if (metadata_value_tree_node == null) {
-            System.err.println("Note: No value tree node for metadata value \"" + metadata_element_value + "\"");
+            Gatherer.println("Note: No value tree node for metadata value \"" + metadata_element_value + "\"");
             metadata_element.addMetadataValue(metadata_element_value);
             metadata_value_tree_node = metadata_element.getMetadataValueTreeNode(metadata_element_value);
@@ -337 +338 @@
 
     // Parse the metadata.xml file
-    System.err.println("Skimming metadata.xml file " + this + "...");
+    Gatherer.println("Skimming metadata.xml file " + this + "...");
     Document document = XMLTools.parseXMLFile(this);
     if (document == null) {

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

@@ -30 +30 @@
 import java.io.*;
 import java.util.*;
+import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.file.FileNode;
 import org.greenstone.gatherer.util.Utility;
@@ -54 +55 @@
     for (int i = 0; i < file_nodes.length; i++) {
         File current_file = file_nodes[i].getFile();
-        System.err.println("Adding metadata to " + current_file.getAbsolutePath());
+        Gatherer.println("Adding metadata to " + current_file.getAbsolutePath());
 
         // Find which metadata.xml file needs editing
@@ -94 +95 @@
     static public ArrayList getMetadataAssignedDirectlyToExternalFile(File file)
     {
-    System.err.println("Getting metadata assigned directly to external file " + file + "...");
+    Gatherer.println("Getting metadata assigned directly to external file " + file + "...");
 
     // Build up a list of applicable metadata.xml files
@@ -174 +175 @@
     for (int i = 0; i < applicable_metadata_xml_files.size(); i++) {
         MetadataXMLFile metadata_xml_file = (MetadataXMLFile) applicable_metadata_xml_files.get(i);
-        System.err.println("Applicable metadata.xml file: " + metadata_xml_file);
+        Gatherer.println("Applicable metadata.xml file: " + metadata_xml_file);
 
         ArrayList metadata_values = metadata_xml_file.getMetadataAssignedToFile(file);
@@ -240 +241 @@
     for (int i = 0; i < file_nodes.length; i++) {
         File current_file = file_nodes[i].getFile();
-        System.err.println("Removing metadata from " + current_file.getAbsolutePath());
+        Gatherer.println("Removing metadata from " + current_file.getAbsolutePath());
 
         // Find which metadata.xml file needs editing
@@ -258 +259 @@
     static public void unloadMetadataXMLFile(File metadata_xml_file_file)
     {
-    System.err.println("Unloading metadata.xml file " + metadata_xml_file_file);
+    Gatherer.println("Unloading metadata.xml file " + metadata_xml_file_file);
 
     // Find the metadata.xml file in the list of loaded files, and remove it