chiark / gitweb /
~yarrgweb / jarrg-ian.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
replace commented-out debugging printlns with ones which use dtxt
[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..b20e359e10bda3c58aa1cbb8988f693c5392d647 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) {
@@ -75,7 +76,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                                int index = text.indexOf(":");
                                String name = text.substring(0,index);
                                islandName = name;
-                               //System.out.println(islandName);
+                               // if (dtxt!=null) dtxt.println(islandName);
                                sidePanel.removePropertyChangeListener(this);
                                latch.countDown();
                        }
@@ -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);
        }
@@ -529,8 +539,8 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                    }
                    int[] offerCount = getBuySellMaps(data,buys,sells,stallMap,commodMap);
                    //println(buys.toString());
-                   //System.out.println(sells);
-                   //System.out.println("\n\n\n"+buys);
+                   // if (dtxt!=null) dtxt.println(sells);
+                   // if (dtxt!=null) dtxt.println("\n\n\n"+buys);
 
                    ByteArrayOutputStream outStream = new ByteArrayOutputStream();
                    pm.setProgress(60);
@@ -597,13 +607,13 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                Accessible node1 = window;
                Accessible node = descendNodes(node1,new int[] {0,1,0,0,0,0,1,0,0,1,0,0}); // commod market
                // commod market: {0,1,0,0,0,0,1,0,0,1,0}  {0,1,0,0,0,0,1,0,1,0,0,1,0,0})
-               //System.out.println(node);
+               // if (dtxt!=null) dtxt.println(node);
                if (!(node instanceof JTable)) {
                        node = descendNodes(node1,new int[] {0,1,0,0,0,0,1,0,1,0,0,1,0,0}); // commod market
                }
                if (!(node instanceof JTable)) return null;
                AccessibleTable table = node.getAccessibleContext().getAccessibleTable();
-               //System.out.println(table);
+               // if (dtxt!=null) dtxt.println(table);
                return table;
        }
        
@@ -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());
+                       // if (dtxt!=null) dtxt.println(parent.getClass());
                }
                return parent;
        }
@@ -705,7 +715,14 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                        int first = sb.indexOf("<pre>") + 5;
                        int last = sb.indexOf("</body>");
                        xml = sb.substring(first,last);
-                       //System.out.println(xml);
+                       //if (dtxt!=null) {
+                       //        dtxt.println(">>");
+                       //        dtxt.println(sb);;
+                       //        dtxt.println("||");
+                       //        dtxt.println(xml);
+                       //        dtxt.println("<<");
+                       //}
+                       // if (dtxt!=null) dtxt.println(xml);
                        Reader reader = new CharArrayReader(xml.toCharArray());
                        Document d = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(reader));
                        NodeList maps = d.getElementsByTagName("CommodMap");
@@ -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) {
@@ -945,7 +962,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
        */
        private boolean finishUpload(InputStream in) throws IOException {
                String html = readstreamstring(in);
-               //System.out.println(html);
+               // if (dtxt!=null) dtxt.println(html);
                Matcher m;
 
                Pattern params = Pattern.compile("(?s)<input type=\"hidden\" name=\"action\" value=\"setisland\" />.+?<input type=\"hidden\" name=\"forcereload\" value=\"([^\"]+)\" />.+?<input type=\"hidden\" name=\"filename\" value=\"([^\"]+)\" />");
@@ -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,13 +1047,13 @@ 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;
     }
 
     private int calculateArbitrageCommodity(ArrayList<SortedSet<int[]>> arb_bs) {
-       //System.out.println("ARBITRAGE?");
+       // if (dtxt!=null) dtxt.println("ARBITRAGE?");
        int profit = 0;
        SortedSet<int[]> buys = arb_bs.get(0);
        SortedSet<int[]> sells = arb_bs.get(1);
@@ -1052,7 +1069,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
            int unitprofit = buy[0] - sell[0];
            int count = buy[1] < sell[1] ? buy[1] : sell[1];
-           //System.out.println(" sell @"+sell[0]+" x"+sell[1]+" buy @"+buy[0]+" x"+buy[1]
+           // if (dtxt!=null) dtxt.println(" sell @"+sell[0]+" x"+sell[1]+" buy @"+buy[0]+" x"+buy[1]
            //                 +" => x"+count+" @"+unitprofit);
 
            if (unitprofit <= 0)
@@ -1064,7 +1081,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
            if (buy[1]==0) buys.remove(buy);
            if (sell[1]==0) sells.remove(sell);
        }
-       //System.out.println(" PROFIT "+profit);
+       // if (dtxt!=null) dtxt.println(" PROFIT "+profit);
        return profit;
     }
 
@@ -1085,15 +1102,15 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
        for (ArrayList<String> row : data) {
            String thiscommod = row.get(0);
-           //System.out.println("ROW "+row.toString());
+           // if (dtxt!=null) dtxt.println("ROW "+row.toString());
            if (lastcommod == null || !thiscommod.equals(lastcommod)) {
                if (lastcommod != null)
                    arbitrage += calculateArbitrageCommodity(arb_bs);
-               //System.out.println("ROW rdy");
+               // if (dtxt!=null) dtxt.println("ROW rdy");
                arb_bs = new ArrayList<SortedSet<int[]>>(2);
                arb_bs.add(0, new TreeSet<int[]>(compar));
                arb_bs.add(1, new TreeSet<int[]>(compar));
-               //System.out.println("ROW init");
+               // if (dtxt!=null) dtxt.println("ROW init");
                lastcommod = thiscommod;
            }
            for (int bs = 0; bs < 2; bs++) {
@@ -1101,7 +1118,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                if (pricestr == null)
                    continue;
                int[] entry = new int[2];
-               //System.out.println("ROW BS "+bs);
+               // if (dtxt!=null) dtxt.println("ROW BS "+bs);
                entry[0] = parseQty(pricestr);
                entry[1] = parseQty(row.get(bs*2 + 3));
                arb_bs.get(bs).add(entry);
JARRG main public tree