Changeset 8236 for trunk/gli/src/org/greenstone/gatherer/msm/parsers/GreenstoneMetadataParser.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/parsers/GreenstoneMetadataParser.java (modified) (10 diffs)

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