debug output option

[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 98c5dd8808ecbe1b1c3c21c04811f33afd495520..a7a90c8c1489d0dfcfaf3f381226c7d866ad2725 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) {
@@ -236,6 +237,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;
@@ -282,7 +291,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                                                resultSummary.setText("");
                                                arbitrageResult.setText("");
                                                try {
-                                                       runPCTB();
+                                                       runUpload();
                                                } catch(Exception e) {
                                                        error(e.toString());
                                                        e.printStackTrace();
@@ -399,7 +408,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
        *
        *       @exception Exception if an error we didn't expect occured
        */
-       private void runPCTB() throws Exception {
+       private void runUpload() throws Exception {
                progresslog("starting");
 
                String yarrgts = "";
@@ -438,6 +447,11 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                    latch.await(2, java.util.concurrent.TimeUnit.SECONDS);
                }
 
+               if (islandName == null) {
+                   error("Could not find island name in YPP user interface.");
+                   return;
+               }
+
                progresslog("table check...");
 
                String headings_expected[] = new String[]
@@ -497,11 +511,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                        progressNote(pm, "Yarrg: Uploading");
                        progresslog("yarrg upload...");
 
-                       if (islandName != null) {
-                               doneyarrg = runYarrg(yarrgts, oceanName, islandName, yarrgdata);
-                       } else {
-                               System.out.println("Couldn't upload to Yarrg - no island name found");
-                       }
+                       doneyarrg = runYarrg(yarrgts, oceanName, islandName, yarrgdata);
                        progresslog("yarrg done.");
                }
 
@@ -704,6 +714,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));