Changeset 8236 for trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.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/cdm/CollectionConfiguration.java (modified) (15 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

@@ -33 +33 @@
 import javax.swing.*;
 import org.greenstone.gatherer.Configuration;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.CommandTokenizer;
@@ -463 +464 @@
         }
         if(!original_file.renameTo(backup_file)) {
-        Gatherer.println("Can't rename collect.cfg");
+        DebugStream.println("Can't rename collect.cfg");
         }
     }
@@ -514 +515 @@
         }
         catch (Exception exception) {
-        Gatherer.println("Error in CollectionConfiguration.save(boolean): " + exception);
-        Gatherer.printStackTrace(exception);
+        DebugStream.println("Error in CollectionConfiguration.save(boolean): " + exception);
+        DebugStream.printStackTrace(exception);
         }
     }
@@ -903 +904 @@
             // Why can't you switch on strings eh? We pass it to the various subparsers who each have a bash at parsing the command. If none can parse the command, an unknown element is created
             if(command_element == null && command_type.equals(BUILDTYPE_STR)) {
-            Gatherer.println("G2.39 Buildtype command detected. Ignoring.");
+            DebugStream.println("G2.39 Buildtype command detected. Ignoring.");
             command_element = document.createElement(UNKNOWN_ELEMENT);
             append_element = false;
@@ -916 +917 @@
             // If this was a G2.39 config file then we manipulate the command string a bit before we submit it to the parser. We start by adding allfields as the first index. We then space separate the remaining indexes, and remove duplicates when encountered. Of course before we do any of that we record the various space separated indexes so that we can remove the collection meta assigned to them.
             if(is_twopointthreenine) {
-                Gatherer.println("G2.39 Index command detected. Modifying.");
-                Gatherer.println("Before: " + command_str);
+                DebugStream.println("G2.39 Index command detected. Modifying.");
+                DebugStream.println("Before: " + command_str);
                 StringBuffer new_command_str = new StringBuffer(command_type);
                 new_command_str.append(SPACE_CHARACTER);
@@ -958 +959 @@
                 command_str = new_command_str.toString();
                 new_command_str = null;
-                Gatherer.println("After: " + command_str);
+                DebugStream.println("After: " + command_str);
             }
             command_element = parseIndex(command_str);
@@ -967 +968 @@
             // If this was a G2.39 config file then we squelch the default index (no such thing in G2.4)
             if(is_twopointthreenine) {
-                Gatherer.println("G2.39 Default Index command detected. Ignoring.");
+                DebugStream.println("G2.39 Default Index command detected. Ignoring.");
                 append_element = false;
             }
@@ -980 +981 @@
             // Again if this is G2.39 we have to do a tiny bit of magic to the levels command. We need to add document level, and change the remainder to lower case.
             if(is_twopointthreenine) {
-                Gatherer.println("G2.39 Levels command detected. Modifying.");
-                Gatherer.println("Before: " + command_str);
+                DebugStream.println("G2.39 Levels command detected. Modifying.");
+                DebugStream.println("Before: " + command_str);
                 StringBuffer new_command_str = new StringBuffer(command_type);
                 new_command_str.append(SPACE_CHARACTER);
@@ -1000 +1001 @@
                 command_str = new_command_str.toString();
                 new_command_str = null;
-                Gatherer.println("After: " + command_str);
+                DebugStream.println("After: " + command_str);
             }
             command_element = parseLevels(command_str);
@@ -1066 +1067 @@
         Element document_element = document.getDocumentElement();
         NodeList collectionmeta_elements = document_element.getElementsByTagName(COLLECTIONMETADATA_ELEMENT);
-        Gatherer.println("There are " + obsolete_collectionmeta_names.size() + " collectionmeta to remove.");
-        Gatherer.println("There are " + changed_collectionmeta_names.size() + " collectionmeta to change.");
+        DebugStream.println("There are " + obsolete_collectionmeta_names.size() + " collectionmeta to remove.");
+        DebugStream.println("There are " + changed_collectionmeta_names.size() + " collectionmeta to change.");
         for(int z = collectionmeta_elements.getLength(); z > 0; z--) {
             Element collectionmeta_element = (Element) collectionmeta_elements.item(z - 1);
             String name = collectionmeta_element.getAttribute(NAME_ATTRIBUTE);
-            Gatherer.println("Checking " + name);
+            DebugStream.println("Checking " + name);
             // Remove any obsolete metadata
             if(obsolete_collectionmeta_names.contains(name)) {
-            Gatherer.println("G2.39 CollectMeta detected. Removing: " + name);
+            DebugStream.println("G2.39 CollectMeta detected. Removing: " + name);
             document_element.removeChild(collectionmeta_element);
             }
@@ -1080 +1081 @@
             else if(changed_collectionmeta_names.containsKey(name)) {
             String new_name = (String) changed_collectionmeta_names.get(name);
-            Gatherer.println("G2.39 CollectMeta detected. Changing: " + name + " -> " + new_name);
+            DebugStream.println("G2.39 CollectMeta detected. Changing: " + name + " -> " + new_name);
             collectionmeta_element.setAttribute(NAME_ATTRIBUTE, new_name);
             new_name = null;
@@ -1088 +1089 @@
 
         // Finally add any newly acquired collectionmeta. This general defaults to the collectionmeta name less the full stop
-        Gatherer.println("There are " + acquired_collectionmeta_names.size() + " collectionmeta to add.");
+        DebugStream.println("There are " + acquired_collectionmeta_names.size() + " collectionmeta to add.");
         for(int y = 0; y < acquired_collectionmeta_names.size(); y++) {
             String name = (String) acquired_collectionmeta_names.get(y);
             String value = name.substring(1);
-            Gatherer.println("G2.39 CollectMeta missing. Adding: " + name + " [l=" + Configuration.getLanguage() + "] \"" + value + "\"");
+            DebugStream.println("G2.39 CollectMeta missing. Adding: " + name + " [l=" + Configuration.getLanguage() + "] \"" + value + "\"");
             Element element = document.createElement(COLLECTIONMETADATA_ELEMENT);
             element.setAttribute(NAME_ATTRIBUTE, name);
@@ -1108 +1109 @@
     }
     catch(Exception exception) {
-        Gatherer.println("Error in CollectionConfiguration.parse(java.io.File): " + exception);
-        Gatherer.printStackTrace(exception);
+        DebugStream.println("Error in CollectionConfiguration.parse(java.io.File): " + exception);
+        DebugStream.printStackTrace(exception);
     }
     }
@@ -1201 +1202 @@
     }
     catch (Exception exception) {
-        Gatherer.printStackTrace(exception);
+        DebugStream.printStackTrace(exception);
         command_element = null;
     }
@@ -1394 +1395 @@
     }
     catch (Exception exception) {
-        Gatherer.printStackTrace(exception);
+        DebugStream.printStackTrace(exception);
         command_element = null;
     }