chiark / gitweb /
~yarrgweb / jarrg-ian.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
replace almost all writes to yohoho log with writes to our debug log
[jarrg-ian.git] / src / com / tedpearson / ypp / market / MarketUploader.java
diff --git a/src/com/tedpearson/ypp/market/MarketUploader.java b/src/com/tedpearson/ypp/market/MarketUploader.java
index 2466b44a8b3fc35fa5c78de039fe022c9c47d276..1b1382e7650d2be2e5e4aa622f94f5258a452292 100644 (file)
--- a/src/com/tedpearson/ypp/market/MarketUploader.java
+++ b/src/com/tedpearson/ypp/market/MarketUploader.java
@@ -65,6 +65,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
        private AccessibleContext sidePanel;
        private HashMap<String,Integer> commodMap;
+        public PrintStream dtxt = null;
 
        private PropertyChangeListener changeListener = new PropertyChangeListener() {
                public void propertyChange(PropertyChangeEvent e) {
@@ -91,8 +92,9 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
        }
 
         private void progresslog(String s) {
+           if (dtxt == null) return;
            long now = new Date().getTime();
-           System.out.println("progress "+(now - startTime)+"ms "+s);
+           dtxt.println("progress "+(now - startTime)+"ms "+s);
        }
 
         private void progressNote(ProgressMonitor pm, String s) {
@@ -236,6 +238,14 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                // check if we've been turned off in the control panel
                Preferences prefs = Preferences.userNodeForPackage(getClass());
 
+               if (prefs.getBoolean("writeDebugFiles", false)) {
+                   try {
+                       dtxt = new PrintStream(new File("jarrg-debug-log.txt"));
+                   } catch (java.io.FileNotFoundException e) {
+                       System.err.println("JARRG: Error opening debug log: "+e);
+                   }
+               }
+
                if (prefs.getBoolean("useLiveServers", false)) {
                        YARRG_URL = YARRG_LIVE_URL;
                        PCTB_HOST_URL = PCTB_LIVE_HOST_URL;
@@ -386,7 +396,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                        html = m.replaceAll(" ");
                }
                String whole_msg = "<html><h1>Error</h1>"+msg+"<h1>PCTB Server said:</h1><blockquote>"+html+"</blockquote>";
-               System.err.println("###" + whole_msg + "###");
+               if (dtxt!=null) dtxt.println("###" + whole_msg + "###");
 
                JOptionPane.showMessageDialog(frame,whole_msg,"Error",JOptionPane.ERROR_MESSAGE);
        }
@@ -620,7 +630,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
        private Accessible descendNodes(Accessible parent, int[] path) {
                for(int i=0;i<path.length;i++) {
                        if (null == (parent = descend(parent, path[i]))) return null;
-                       // System.out.println(parent.getClass());
+                       //System.out.println(parent.getClass());
                }
                return parent;
        }
@@ -705,6 +715,13 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                        int first = sb.indexOf("<pre>") + 5;
                        int last = sb.indexOf("</body>");
                        xml = sb.substring(first,last);
+                       //if (dtxt!=null) {
+                       //        dtxt.println(">>");
+                       //        dtxt.println(sb);;
+                       //        dtxt.println("||");
+                       //        dtxt.println(xml);
+                       //        dtxt.println("<<");
+                       //}
                        //System.out.println(xml);
                        Reader reader = new CharArrayReader(xml.toCharArray());
                        Document d = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(reader));
@@ -775,7 +792,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                                        buySellCount[1]++;
                                }
                        } catch(IllegalArgumentException e) {
-                               System.err.println("Error: Unsupported Commodity \"" + offer.get(0) + "\"");
+                               if (dtxt!=null) dtxt.println("Error: Unsupported Commodity \"" + offer.get(0) + "\"");
                        }
                }
                if (buySellCount[0]==0 && buySellCount[1]==0) {
@@ -980,7 +997,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                Pattern done = Pattern.compile("Your data has been integrated into the database. Thank you!");
                m = done.matcher(complete);
                if(m.find()) {
-                       System.out.println("FILE upload successful!!!");
+                       if (dtxt!=null) dtxt.println("FILE upload successful!!!");
                        return true;
                } else {
                        error_html("Something was wrong with the final upload parameters!", complete);
@@ -1030,7 +1047,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
        BufferedReader br = new BufferedReader(new InputStreamReader(in));
        String yarrgresult; 
        while((yarrgresult = br.readLine()) != null) {
-           System.out.println(yarrgresult);
+           if (dtxt!=null) dtxt.println(yarrgresult);
        }
        return true;
     }
JARRG main public tree