dtxt.println("progress "+(now - startTime)+"ms "+s);
}
+ private void debug_write_stringdata(String what, String data) throws FileNotFoundException,IOException {
+ if (dtxt==null) return;
+ PrintStream strm = new PrintStream(new File("jarrg-debug-"+what));
+ strm.print(data);
+ strm.close();
+ }
+
private void progressNote(ProgressMonitor pm, String s) {
String arb = null;
if (arbitrageResult != null)
* Entry point. Read our preferences.
*/
public MarketUploader() {
- // check if we've been turned off in the control panel
Preferences prefs = Preferences.userNodeForPackage(getClass());
if (prefs.getBoolean("writeDebugFiles", false)) {
sidePanel.removePropertyChangeListener(changeListener);
}
}
- //findMarketTable();
findMarket.setEnabled(true);
}
}.start();
}
}
}
- // if we don't find the island name, hopefully the server will
}
/**
}
private void error_html(String msg, String html) {
- //System.err.println("===" + html + "===");
-
Pattern body = Pattern.compile("<body>(.*)</body>", Pattern.DOTALL | Pattern.CASE_INSENSITIVE);
Matcher m = body.matcher(html);
if (m.find()) {
*
* @exception Exception if an error we didn't expect occured
*/
+ private class YarrgTimestampFetcher extends Thread {
+ public String ts = null;
+ public void run() {
+ try {
+ ts = getYarrgTimestamp();
+ progresslog("(async) yarrg timestamp ready.");
+ } catch(Exception e) {
+ error("Error getting YARRG timestamp: "+e);
+ }
+ }
+ };
+
private void runUpload() throws Exception {
progresslog("starting");
- String yarrgts = "";
ProgressMonitor pm = new ProgressMonitor(frame,"Processing Market Data","Getting table data",0,100);
pm.setMillisToDecideToPopup(0);
pm.setMillisToPopup(0);
boolean doneyarrg = false, donepctb = false;
+ YarrgTimestampFetcher yarrgts_thread = null;
if (uploadToYarrg) {
- progresslog("yarrg timestamp...");
- yarrgts = getYarrgTimestamp();
- progresslog("yarrg timestamp done.");
+ progresslog("(async) yarrg timestamp...");
+ yarrgts_thread = new YarrgTimestampFetcher();
+ yarrgts_thread.start();
}
AccessibleTable accesstable = findMarketTable();
return;
}
- progresslog("getisland...");
+ progresslog("(async) getisland...");
getIsland();
progresslog("getocean...");
getOcean();
if (latch != null) {
latch.await(2, java.util.concurrent.TimeUnit.SECONDS);
}
+ progresslog("(async) getisland done");
+
+ String yarrgts = null;
+ if (yarrgts_thread != null) {
+ progresslog("(async) yarrg timestamp join...");
+ yarrgts_thread.join();
+ progresslog("(async) yarrg timestamp joined.");
+ yarrgts = yarrgts_thread.ts;
+ }
if (islandName == null) {
error("Could not find island name in YPP user interface.");
progressNote(pm, "Yarrg: Uploading");
progresslog("yarrg upload...");
+ debug_write_stringdata("yarrg-deduped.tsv", yarrgdata);
+
doneyarrg = runYarrg(yarrgts, oceanName, islandName, yarrgdata);
progresslog("yarrg done.");
}
}
// get commod map
+ progresslog("pctb commodmap...");
HashMap<String,Integer> commodMap = getCommodMap();
if(commodMap == null) {
return;
}
+ progresslog("pctb commodmap done.");
int[] offerCount = getBuySellMaps(data,buys,sells,stallMap,commodMap);
- //println(buys.toString());
// if (dtxt!=null) dtxt.println(sells);
// if (dtxt!=null) dtxt.println("\n\n\n"+buys);
return;
}
GZIPOutputStream out = new GZIPOutputStream(outStream);
- //FileOutputStream out = new FileOutputStream(new File("output.text"));
DataOutputStream dos = new DataOutputStream(out);
dos.writeBytes("005y\n");
dos.writeBytes(stallMap.size()+"\n");
writeBuySellOffers(buys,sells,offerCount,out);
out.finish();
progresslog("pctb send...");
- InputStream in = sendInitialData(new ByteArrayInputStream(outStream.toByteArray()));
+
+ byte[] ba = outStream.toByteArray();
+ if (dtxt!=null) {
+ FileOutputStream dbgdata = new FileOutputStream(new File("jarrg-debug-pctb-marketdata.gz"));
+ dbgdata.write(ba);
+ dbgdata.close();
+ }
+
+ InputStream in = sendInitialData(new ByteArrayInputStream(ba));
progresslog("pctb sent.");
if (in == null) return;
pm.setProgress(80);
/**
* Gets the list of commodities and their associated commodity ids.
- * On the first run, the data is downloaded from the PCTB server.
- * After the first run, the data is cached using <code>Preferences</code>.
- * <p>
- * Potential issues: When more commodities are added to the server, this
- * program will currently break unless the user deletes the preferences
- * file or we give them a new release with a slighly different storage
- * location for the data.
*
* @return a map where the key is the commodity and the value is the commodity id.
*/
return commodMap;
}
HashMap<String,Integer> map = new HashMap<String,Integer>();
- Preferences prefs = Preferences.userNodeForPackage(getClass());
String xml;
try {
URL host = new URL(PCTB_HOST_URL + "commodmap.php");
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("<<");
- //}
- // 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");
*/
private boolean finishUpload(InputStream in) throws IOException {
String html = readstreamstring(in);
- // if (dtxt!=null) dtxt.println(html);
+ debug_write_stringdata("pctb-initial.html", 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=\"([^\"]+)\" />");
URL get = new URL(PCTB_HOST_URL + "upload.php?action=setisland&ocean=" + oceanNum + "&island="
+ islandNum + "&forcereload=" + forceReload + "&filename=" + filename);
String complete = readstreamstring(get.openStream());
+ debug_write_stringdata("pctb-final.html", complete);
Pattern done = Pattern.compile("Your data has been integrated into the database. Thank you!");
m = done.matcher(complete);
if(m.find()) {
- if (dtxt!=null) dtxt.println("FILE upload successful!!!");
return true;
} else {
error_html("Something was wrong with the final upload parameters!", complete);
http.setParameter("data", "deduped.tsv.gz", file, "application/octet-stream");
InputStream in = post_for_yarrg(http);
if (in == null) return false;
- BufferedReader br = new BufferedReader(new InputStreamReader(in));
- String yarrgresult;
- while((yarrgresult = br.readLine()) != null) {
- if (dtxt!=null) dtxt.println(yarrgresult);
+ String output = readstreamstring(in);
+ if (!output.startsWith("OK")) {
+ error("<html><h1>Unexpected output from YARRG server</h1>\n" + output);
+ return false;
}
+ debug_write_stringdata("yarrg-result.txt", output);
return true;
}
~yarrgweb / jarrg-ian.git / blobdiff