diff options
| author | blafoo <github@blafoo.de> | 2012-05-24 22:23:55 +0200 |
|---|---|---|
| committer | blafoo <github@blafoo.de> | 2012-05-24 22:24:43 +0200 |
| commit | 4687ae23de33b3405c36f21457327f8d80198bee (patch) | |
| tree | 727664557d1051bc7e8cc6efd142056b5ba9be31 | |
| parent | fe96427ff3c7def390d3b096927d0041d40a915e (diff) | |
| download | cgeo-4687ae23de33b3405c36f21457327f8d80198bee.zip cgeo-4687ae23de33b3405c36f21457327f8d80198bee.tar.gz cgeo-4687ae23de33b3405c36f21457327f8d80198bee.tar.bz2 | |
Parsing fails for guests
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/GCConstants.java | 1 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/GCParser.java | 8 | ||||
| -rw-r--r-- | tests/src/cgeo/geocaching/connector/gc/GCConstantsTest.java | 2 |
3 files changed, 1 insertions, 10 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConstants.java b/main/src/cgeo/geocaching/connector/gc/GCConstants.java index 1badaf4..be3abbb 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCConstants.java +++ b/main/src/cgeo/geocaching/connector/gc/GCConstants.java @@ -161,7 +161,6 @@ public final class GCConstants { public final static String STRING_UNPUBLISHED_OWNER = "Cache is Unpublished"; public final static String STRING_UNPUBLISHED_OTHER = "you cannot view this cache listing until it has been published"; public final static String STRING_UNKNOWN_ERROR = "An Error Has Occurred"; - public final static String STRING_CACHEINFORMATIONTABLE = "<div id=\"ctl00_ContentBody_CacheInformationTable\" class=\"CacheInformationTable\">"; public final static String STRING_DISABLED = "<li>This cache is temporarily unavailable."; public final static String STRING_ARCHIVED = "<li>This cache has been archived,"; public final static String STRING_CACHEDETAILS = "id=\"cacheDetails\""; diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java index 543d2aa..ca12da5 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCParser.java +++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java @@ -391,14 +391,6 @@ public abstract class GCParser { tableInside = tableInside.substring(pos); - pos = tableInside.indexOf(GCConstants.STRING_CACHEINFORMATIONTABLE); - if (pos == -1) { - Log.e("GCParser.parseCache: class \"CacheInformationTable\" not found on page"); - return null; - } - - tableInside = tableInside.substring(0, pos); - if (StringUtils.isNotBlank(tableInside)) { // cache terrain String result = BaseUtils.getMatch(tableInside, GCConstants.PATTERN_TERRAIN, true, null); diff --git a/tests/src/cgeo/geocaching/connector/gc/GCConstantsTest.java b/tests/src/cgeo/geocaching/connector/gc/GCConstantsTest.java index a188eb6..7c69606 100644 --- a/tests/src/cgeo/geocaching/connector/gc/GCConstantsTest.java +++ b/tests/src/cgeo/geocaching/connector/gc/GCConstantsTest.java @@ -21,7 +21,7 @@ public class GCConstantsTest extends AndroidTestCase { public static void testCacheCount() { assertCacheCount(149, "<strong><img src=\"/images/icons/icon_smile.png\" title=\"Caches Found\" /> 149</strong>"); - assertCacheCount(579, MockedCache.readCachePage("GC2CJPF")); // # of caches found by blafoo at the point of time creating the mocked data + assertCacheCount(590, MockedCache.readCachePage("GC2CJPF")); // # of caches found by blafoo at the point of time creating the mocked data assertCacheCount(1510, "<strong><img src=\"/images/icons/icon_smile.png\" title=\"Caches Found\" /> 1,510 · <img src=\"/images/challenges/types/sm/challenge.png\" title=\"Challenges Completed\" /> 2</strong>"); assertCacheCount(67, "<strong><img title=\"Caches Found\" src=\"/images/icons/icon_smile.png\"/> 67</strong>"); assertCacheCount(1067, "<strong><img title=\"Caches Found\" src=\"/images/icons/icon_smile.png\"/> 1,067</strong>"); |