From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 12 Sep 2010 13:20:12 +0000 (+0100)
Subject: allow uploading other than from markets (don't mind 7 column tables)
X-Git-Tag: 1.0.0^0
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=jarrg-ian.git;a=commitdiff_plain;h=06195f9c192ea40da255e63846a657205c42d46a

allow uploading other than from markets (don't mind 7 column tables)
---

diff --git a/src/net/chiark/yarrg/MarketUploader.java b/src/net/chiark/yarrg/MarketUploader.java
index 234da5f..4a6a0e5 100644
--- a/src/net/chiark/yarrg/MarketUploader.java
+++ b/src/net/chiark/yarrg/MarketUploader.java
@@ -494,8 +494,9 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 		    error("Table headings not one row! " + headers.toString());
 		    return;
 		}
-		if (headers.get(0).size() != 6) {
-		    error("Table headings not six columns! " + headers.toString());
+		if (headers.get(0).size() < 6 ||
+		    headers.get(0).size() > 7) {
+		    error("Table headings not six or seven columns! " + headers.toString());
 		    return;
 		}
 		for (int col=0; col<headings_expected.length; col++) {