X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=src%2Fcom%2Ftedpearson%2Fypp%2Fmarket%2FMarketUploader.java;h=7632c01f1221bd8ac3b27fd0c1242bcaeca3fbe6;hb=0b0a3e3376419ae1321e349764092c0210cda5eb;hp=4886868a89a61a2fb67f87dd247c0c88ed32a1f1;hpb=615a2587009b0e237aeafc0313cfe6cf76aa69c3;p=jarrg-ian.git

diff --git a/src/com/tedpearson/ypp/market/MarketUploader.java b/src/com/tedpearson/ypp/market/MarketUploader.java
index 4886868..7632c01 100644
--- a/src/com/tedpearson/ypp/market/MarketUploader.java
+++ b/src/com/tedpearson/ypp/market/MarketUploader.java
@@ -16,37 +16,29 @@ import org.w3c.dom.*;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.xml.sax.InputSource;
 import java.util.zip.GZIPOutputStream;
-import com.myjavatools.web.ClientHttpRequest;
+import net.chiark.yarrg.ClientHttpRequest;
 import java.util.regex.*;
 import java.util.prefs.Preferences;
 import java.beans.*;
-import com.tedpearson.util.update.*;
-
-/*
-	TODO:
-	allow adding new islands
-	allow adding new oceans
-*/
 
 /**
-*	MarketUploader is a class that handles the uploading of market data from
-*	Yohoho! Puzzle Pirates. Currently, it must be launched in the save Java
-*	Virtual Machine as YPP. This is handled by a sister "helper" class,
-*	{@link MarketUploaderRunner}.
-*	<p>
-*	MarketUploader initializes after the main YPP window has initialized. It
-*	provides a simple window with a "Capture Market Data" button displayed.
-*	Upon clicking this button, a progress dialog is displayed, and the data
-*	is processed and submitted to the Pirate Commodities Trader with Bleach (PCTB)
-*	web server. If any errors occur, an error dialog is shown, and processing
-*	returns, the button becoming re-enabled.
-*	
-*	@see MarketUploaderRunner
+*	MarketUploader is a class that handles the uploading of market
+*	data from Yohoho! Puzzle Pirates via the Java Accessibility
+*	API.
+*
+*	MarketUploader initializes after the main YPP window has
+*	initialized. It provides a simple window with a "Capture
+*	Market Data" button displayed.  Upon clicking this button, a
+*	progress dialog is displayed, and the data is processed and
+*	submitted to the YARRG and PCTB servers. If any errors occur,
+*	an error dialog is shown, and processing returns, the button
+*	becoming re-enabled.
 */
 public class MarketUploader implements TopLevelWindowListener, GUIInitializedListener {
 	private JFrame frame = null;
 	private Window window = null;
 	private JButton findMarket = null;
+	private JLabel resultSummary = null;
 
 	private final static String PCTB_LIVE_HOST_URL = "http://pctb.crabdance.com/";
 	private final static String PCTB_TEST_HOST_URL = "http://pctb.ilk.org/";
@@ -54,8 +46,9 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
 	// Yarrg protocol parameters
 	private final static String YARRG_CLIENTNAME = "jpctb greenend";
-	private final static String YARRG_CLIENTVERSION = "0.1";
-	private final static String YARRG_CLIENTFIXES = "";
+	private final static String YARRG_CLIENTVERSION =
+	    com.tedpearson.ypp.market.Version.version;
+	private final static String YARRG_CLIENTFIXES = "bug-094";
 	private final static String YARRG_LIVE_URL = "http://upload.yarrg.chiark.net/commod-update-receiver";
 	private final static String YARRG_TEST_URL = "http://upload.yarrg.chiark.net/test/commod-update-receiver";
 	private String YARRG_URL;
@@ -69,14 +62,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
 	private AccessibleContext sidePanel;
 	private HashMap<String,Integer> commodMap;
-	private HashMap<String,String> islandNumbers = new HashMap<String,String>();
-	{
-		String[] nums = new String[]
-			{"","Viridian","Midnight","Hunter","Cobalt","Sage","Ice","Malachite","Crimson","Opal"};
-		for(int i=1;i<nums.length;i++) {
-			islandNumbers.put(nums[i],""+i);
-		}
-	}
+
 	private PropertyChangeListener changeListener = new PropertyChangeListener() {
 		public void propertyChange(PropertyChangeEvent e) {
 			if(e.getNewValue() != null && 
@@ -223,17 +209,11 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 	}
 	
 	/**
-	*	Entry point. Remove modified files and replace with backups.
-	*	Register the jar file we are running from to be deleted upon quit.
-	*	Finally, conditionally set up the GUI.
+	*	Entry point.  Read our preferences.
 	*/
 	public MarketUploader() {
 		// check if we've been turned off in the control panel
 		Preferences prefs = Preferences.userNodeForPackage(getClass());
-		boolean launch = prefs.getBoolean("launchAtStartup", true);
-		if(!launch) {
-			return;
-		}
 
 		if (prefs.getBoolean("useLiveServers", false)) {
 			YARRG_URL = YARRG_LIVE_URL;
@@ -255,8 +235,9 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 	}
 	
 	/**
-	*	Set up the GUI, with its window and one-button interface. Only initialize
-	*	if we're running alongside a Window named "Puzzle Pirates" though.
+	*	Set up the GUI, with its window and one-button
+	*	interface. Only initialize if we're running alongside
+	*	a Window named "Puzzle Pirates" though.
 	*/
 	private void createGUI() {
 		if (frame != null && window != null) {
@@ -265,7 +246,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 		}
 		frame = new JFrame("MarketUploader");
 		frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-		frame.getContentPane().setLayout(new FlowLayout());
+		frame.getContentPane().setLayout(new GridLayout(2,1));
 		//frame.setPreferredSize(new Dimension(200, 60));
 		
 		findMarket = new JButton("Upload Market Data");
@@ -274,11 +255,13 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 				findMarket.setEnabled(false);
 				new Thread() {
 					public void run() {
+						resultSummary.setText("");
 						try {
 							runPCTB();
 						} catch(Exception e) {
 							error(e.toString());
 							e.printStackTrace();
+							resultSummary.setText("failed");
 						} finally {
 							if(sidePanel != null) {
 								// remove it if it's still attached
@@ -292,6 +275,10 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 			}
 		});
 		frame.add(findMarket);
+
+		resultSummary = new JLabel("ready");
+		frame.add(resultSummary);
+		
 		frame.pack();
 	}
 	
@@ -307,7 +294,6 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 		try {
 			islandName = ((JLabel)leagueTracker).getToolTipText();
 		} catch (NullPointerException e) {
-			
 			// evidently we're actually on an island
 
 			islandName = null;
@@ -354,6 +340,25 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 		JOptionPane.showMessageDialog(frame,msg,"Error",JOptionPane.ERROR_MESSAGE);
 	}
 	
+	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()) {
+			html = m.group(1);
+			Pattern fixup = Pattern.compile("<(\\w+) */>");;
+			m = fixup.matcher(html);
+			html = m.replaceAll("<$1>");
+			m = Pattern.compile("[\\r\\n]+").matcher(html);
+			html = m.replaceAll(" ");
+		}
+		String whole_msg = "<html><h1>Error</h1>"+msg+"<h1>PCTB Server said:</h1><blockquote>"+html+"</blockquote>";
+		System.err.println("###" + whole_msg + "###");
+
+		JOptionPane.showMessageDialog(frame,whole_msg,"Error",JOptionPane.ERROR_MESSAGE);
+	}
+	
 	/**
 	*	Run the data collection process, and upload the results. This is the method
 	*	that calls most of the other worker methods for the process. If an error occurs,
@@ -367,6 +372,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 		ProgressMonitor pm = new ProgressMonitor(frame,"Processing Market Data","Getting table data",0,100);
 		pm.setMillisToDecideToPopup(0);
 		pm.setMillisToPopup(0);
+		boolean doneyarrg = false, donepctb = false;
 
 		if (uploadToYarrg) {
 			yarrgts = getYarrgTimestamp();
@@ -395,8 +401,8 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
 		ArrayList<ArrayList<String>> data = getData(t);
 
-		if (uploadToYarrg) {
-			pm.setNote("Preparing data for Yarrg");
+		if (uploadToYarrg && yarrgts != null) {
+			pm.setNote("Yarrg: Preparing data");
 			pm.setProgress(10);
 
 			StringBuilder yarrgsb = new StringBuilder();
@@ -416,63 +422,73 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
 			yarrgdata = yarrgsb.toString();
 
-			pm.setNote("Uploading to Yarrg");
+			pm.setNote("Yarrg: Uploading");
 
 			if (islandName != null) {
-				runYarrg(yarrgts, oceanName, islandName, yarrgdata);
+				doneyarrg = runYarrg(yarrgts, oceanName, islandName, yarrgdata);
 			} else {
 				System.out.println("Couldn't upload to Yarrg - no island name found");
 			}
 		}
 
-		pm.setNote("Getting stall names");
-		pm.setProgress(20);
-		if(pm.isCanceled()) {
+		if (uploadToPCTB) {
+		    pm.setNote("PCTB: Getting stall names");
+		    pm.setProgress(20);
+		    if(pm.isCanceled()) {
 			return;
-		}
-		TreeSet<Offer> buys = new TreeSet<Offer>();
-		TreeSet<Offer> sells = new TreeSet<Offer>();
-		LinkedHashMap<String,Integer> stallMap = getStallMap(data);
-		pm.setProgress(40);
-		pm.setNote("Sorting offers");
-		if(pm.isCanceled()) {
+		    }
+		    TreeSet<Offer> buys = new TreeSet<Offer>();
+		    TreeSet<Offer> sells = new TreeSet<Offer>();
+		    LinkedHashMap<String,Integer> stallMap = getStallMap(data);
+		    pm.setProgress(40);
+		    pm.setNote("PCTB: Sorting offers");
+		    if(pm.isCanceled()) {
 			return;
-		}
-		// get commod map
+		    }
+		    // get commod map
 		
-		HashMap<String,Integer> commodMap = getCommodMap();
-		if(commodMap == null) {
+		    HashMap<String,Integer> commodMap = getCommodMap();
+		    if(commodMap == null) {
 			return;
+		    }
+		    int[] offerCount = getBuySellMaps(data,buys,sells,stallMap,commodMap);
+		    //println(buys.toString());
+		    //System.out.println(sells);
+		    //System.out.println("\n\n\n"+buys);
+
+		    ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+		    pm.setProgress(60);
+		    pm.setNote("PCTB: Sending data");
+		    if(pm.isCanceled()) {
+			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");
+		    dos.writeBytes(getAbbrevStallList(stallMap));
+		    writeBuySellOffers(buys,sells,offerCount,out);
+		    out.finish();
+		    InputStream in = sendInitialData(new ByteArrayInputStream(outStream.toByteArray()));
+		    if (in == null) return;
+		    pm.setProgress(80);
+		    if(pm.isCanceled()) {
+			return;
+		    }
+		    pm.setNote("PCTB: Waiting ...");
+		    donepctb = finishUpload(in);
 		}
-		int[] offerCount = getBuySellMaps(data,buys,sells,stallMap,commodMap);
-		//println(buys.toString());
-		//System.out.println(sells);
-		//System.out.println("\n\n\n"+buys);
+		pm.setProgress(100);
 
-		if (uploadToPCTB) {
-			ByteArrayOutputStream outStream = new ByteArrayOutputStream();
-			pm.setProgress(60);
-			pm.setNote("Sending data");
-			if(pm.isCanceled()) {
-				return;
-			}
-			GZIPOutputStream out = new GZIPOutputStream(outStream);
-			//FileOutputStream out = new FileOutputStream(new File("output.text"));
-			DataOutputStream dos = new DataOutputStream(out);
-			dos.writeBytes("005\n");
-			dos.writeBytes(stallMap.size()+"\n");
-			dos.writeBytes(getAbbrevStallList(stallMap));
-			writeBuySellOffers(buys,sells,offerCount,out);
-			out.finish();
-			InputStream in = sendInitialData(new ByteArrayInputStream(outStream.toByteArray()));
-			pm.setProgress(80);
-			if(pm.isCanceled()) {
-				return;
-			}
-			pm.setNote("Waiting for PCTB...");
-			finishUpload(in);
+		if ((uploadToPCTB && !donepctb) ||
+		    (uploadToYarrg && !doneyarrg)) {
+		        resultSummary.setText("trouble");
+		} else if (donepctb || doneyarrg) {
+		        resultSummary.setText("Done " + islandName);
+		} else {
+		        resultSummary.setText("uploaded nowhere!");
 		}
-		pm.setProgress(100);
 	}
 	
 	/**
@@ -611,7 +627,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 			//System.out.println(xml);
 			Reader reader = new CharArrayReader(xml.toCharArray());
 			Document d = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(reader));
-			NodeList maps = d.getElementsByTagName("c");
+			NodeList maps = d.getElementsByTagName("CommodMap");
 			for(int i=0;i<maps.getLength();i++) {
 				NodeList content = maps.item(i).getChildNodes();
 				Integer num = Integer.parseInt(content.item(1).getTextContent());
@@ -678,9 +694,13 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 					buySellCount[1]++;
 				}
 			} catch(IllegalArgumentException e) {
-				// System.err.println("Error: Unsupported Commodity \"" + offer.get(0) + "\"");
+				System.err.println("Error: Unsupported Commodity \"" + offer.get(0) + "\"");
 			}
 		}
+		if (buySellCount[0]==0 && buySellCount[1]==0) {
+		    error("No (valid) offers for PCTB?!");
+		    throw new IllegalArgumentException();
+		}
 		return buySellCount;
 	}
 	
@@ -795,6 +815,16 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 		writeOffers(out,sells);
 	}
 	
+	private String readstreamstring(InputStream in) throws IOException {
+		StringBuilder sb = new StringBuilder();
+		BufferedReader br = new BufferedReader(new InputStreamReader(in));
+		String str;
+		while((str = br.readLine()) != null) {
+			sb.append(str+"\n");
+		}
+		return sb.toString();
+	}
+
 	/**
 	*	Sends the data to the server via multipart-formdata POST,
 	*	with the gzipped data as a file upload.
@@ -804,7 +834,12 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 	private InputStream sendInitialData(InputStream file) throws IOException {
 		ClientHttpRequest http = new ClientHttpRequest(PCTB_HOST_URL + "upload.php");
 		http.setParameter("marketdata","marketdata.gz",file,"application/gzip");
-		return http.post();
+		if (!http.post()) {
+			String err = readstreamstring(http.resultstream());
+			error("Error sending initial data:\n"+err);
+			return null;
+		}
+		return http.resultstream();
 	}
 	
 	/**
@@ -827,123 +862,74 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 	*
 	*	@param in stream of data from the server to read
 	*/
-	private void finishUpload(InputStream in) throws IOException {
-		StringBuilder sb = new StringBuilder();
-		BufferedReader br = new BufferedReader(new InputStreamReader(in));
-		String str;
-		while((str = br.readLine()) != null) {
-			sb.append(str+"\n");
-		}
-		String html = sb.toString();
+	private boolean finishUpload(InputStream in) throws IOException {
+		String html = readstreamstring(in);
 		//System.out.println(html);
-		String topIsland = "0", ocean, islandNum, action, forceReload, filename;
 		Matcher m;
-		Pattern whoIsland = Pattern.compile("<option value=\"\\d+\">" + islandName + ", ([^<]+)</ocean>");
-		m = whoIsland.matcher(html);
-		if(m.find()) {
-			// the server agrees with us
-			ocean = islandNumbers.get(m.group(1));
-		} else {
-			// if the server doesn't agree with us:
-			Pattern island = Pattern.compile("<option value=\"(\\d+)\">([^,]+), ([^<]+)</ocean>");
-			m = island.matcher(html);
-			if(!m.find()) {
-				// server doesn't know what island. if we do, let's select it.
-				if(islandName != null && !islandName.equals("")) {
-					// find the island name in the list as many times as it occurs
-					// if more than once, present a dialog
-					// set the ocean, we have the islandname, topIsland = 0
-					Pattern myIsland = Pattern.compile("islands\\[(\\d+)\\]\\[\\d+\\]=new Option\\(\"" + islandName +
-						"\",\\d+");
-					Matcher m1 = myIsland.matcher(html);
-					ArrayList<Integer> myOceanNums = new ArrayList<Integer>();
-					while(m1.find()) {
-						myOceanNums.add(new Integer(m1.group(1)));
-					}
-					if(myOceanNums.size() > 0) {
-						if(myOceanNums.size() > 1) {
-							String[] myOceansList = new String[myOceanNums.size()];
-							int i = 0;
-							for(int myOcean : myOceanNums) {
-								Pattern oceanNumPat = Pattern.compile("<option value=\"\\" + myOcean + "\">([^<]+)</option>");
-								m1 = oceanNumPat.matcher(html);
-								if(m1.find()) {
-									myOceansList[i++] = m1.group(1);
-								}
-							}
-							Object option = JOptionPane.showInputDialog(null,"We found islands named \"" +
-								islandName +"\" on " + myOceansList.length + " oceans:","Choose Ocean",
-								JOptionPane.QUESTION_MESSAGE, null, myOceansList, null);
-							if(option == null) {
-								error("Unable to determine the current island!");
-								return;
-							}
-							ocean = islandNumbers.get(option).toString();
-						} else {
-							ocean = myOceanNums.get(0).toString();
-						}
-					} else {
-						error("Unknown island!");
-						return;
-					}
-				} else {
-					error("Unable to determine island name from the client!");
-					return;
-				}
-			} else {
-				topIsland = m.group(1);
-				islandName = m.group(2);
-				ocean = islandNumbers.get(m.group(3));
-			}
-		}
-		Pattern oceanIslandNum = Pattern.compile("islands\\[" + ocean + "\\]\\[\\d+\\]=new Option\\(\"" + islandName + "\",(\\d+)");
-		m = oceanIslandNum.matcher(html);
-		if(!m.find()) {
-			error("This does not seem to be a valid island! Unable to upload.");
-			return;
-		}
-		islandNum = m.group(1);
-		Pattern params = Pattern.compile("(?s)<input type=\"hidden\" name=\"action\" value=\"([^\"]+)\" />.+?<input type=\"hidden\" name=\"forcereload\" value=\"([^\"]+)\" />.+?<input type=\"hidden\" name=\"filename\" value=\"([^\"]+)\" />");
+
+		Pattern params = Pattern.compile("(?s)<input type=\"hidden\" name=\"action\" value=\"setisland\" />.+?<input type=\"hidden\" name=\"forcereload\" value=\"([^\"]+)\" />.+?<input type=\"hidden\" name=\"filename\" value=\"([^\"]+)\" />");
 		m = params.matcher(html);
 		if(!m.find()) {
-			error("The PCTB server returned unusual data. Maybe you're using an old version of the uploader?");
-			return;
+			error_html("The PCTB server returned unusual data. Maybe you're using an old version of the uploader?",
+				   html);
+			return false;
 		}
-		action = m.group(1);
-		forceReload = m.group(2);
-		filename = m.group(3);
-		URL get = new URL(PCTB_HOST_URL + "upload.php?topisland=" + topIsland + "&ocean=" + ocean + "&island="
-			+ islandNum + "&action=" + action + "&forcereload=" + forceReload + "&filename=" + filename);
-		// System.out.println(get);
-		BufferedReader br2 = new BufferedReader(new InputStreamReader(get.openStream()));
-		sb = new StringBuilder();
-		while((str = br2.readLine()) != null) {
-			sb.append(str+"\n");
+		String forceReload = m.group(1);
+		String filename = m.group(2);
+
+		Pattern oceanNumPat = Pattern.compile("<option value=\"(\\d+)\">"+oceanName+"</option>");
+		m = oceanNumPat.matcher(html);
+		if (!m.find()) {
+			error_html("Unable to find the ocean in the server's list of oceans!", html);
+			return false;
+		}
+		String oceanNum = m.group(1);
+
+		Pattern oceanIslandNum = Pattern.compile("islands\\[" + oceanNum + "\\]\\[\\d+\\]=new Option\\(\"" + islandName + "\",(\\d+)");
+		m = oceanIslandNum.matcher(html);
+		if(!m.find()) {
+			error_html("This does not seem to be a valid island! Unable to upload.", html);
+			return false;
 		}
+		String islandNum = m.group(1);
+
+		URL get = new URL(PCTB_HOST_URL + "upload.php?action=setisland&ocean=" + oceanNum + "&island="
+			+ islandNum + "&forcereload=" + forceReload + "&filename=" + filename);
+		String complete = readstreamstring(get.openStream());
 		Pattern done = Pattern.compile("Your data has been integrated into the database. Thank you!");
-		m = done.matcher(sb.toString());
+		m = done.matcher(complete);
 		if(m.find()) {
-			//System.out.println("FILE upload successful!!!");
+			System.out.println("FILE upload successful!!!");
+			return true;
 		} else {
-			error("Something was wrong with the final upload parameters!");
-			System.err.println(sb.toString());
-			System.err.println(html);
+			error_html("Something was wrong with the final upload parameters!", complete);
+			return false;
 		}
 	}
 
+    private InputStream post_for_yarrg(ClientHttpRequest http) throws IOException {
+	if (!http.post()) {
+	    String err = readstreamstring(http.resultstream());
+	    error("<html><h1>Error reported by YARRG server</h1>\n" + err);
+	    return null;
+	}
+	return http.resultstream();
+    }
+
     private String getYarrgTimestamp() throws IOException {
 	ClientHttpRequest http = new ClientHttpRequest (YARRG_URL);
 	http.setParameter("clientname", YARRG_CLIENTNAME);
 	http.setParameter("clientversion", YARRG_CLIENTVERSION);
 	http.setParameter("clientfixes", YARRG_CLIENTFIXES);
 	http.setParameter("requesttimestamp", "y");
-	InputStream in = http.post();
+	InputStream in = post_for_yarrg(http);
+	if (in == null) return null;
 	BufferedReader br = new BufferedReader(new InputStreamReader(in));
 	String tsresult = br.readLine();
 	return tsresult.substring(3, tsresult.length()-1);
     }
 
-    private void runYarrg(String timestamp, String ocean, String island, String yarrgdata) throws IOException {
+    private boolean runYarrg(String timestamp, String ocean, String island, String yarrgdata) throws IOException {
 	ByteArrayOutputStream bos = new ByteArrayOutputStream();
 	BufferedOutputStream bufos = new BufferedOutputStream(new GZIPOutputStream(bos));
 	bufos.write(yarrgdata.getBytes() );
@@ -958,12 +944,14 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 	http.setParameter("ocean", ocean);
 	http.setParameter("island", island);
 	http.setParameter("data", "deduped.tsv.gz", file, "application/octet-stream");
-	InputStream in = http.post();
+	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) {
 	    System.out.println(yarrgresult);
 	}
+	return true;
     }
     
 }