diff options
| author | SammysHP <sven@sammyshp.de> | 2011-08-22 10:29:26 +0200 |
|---|---|---|
| committer | SammysHP <sven@sammyshp.de> | 2011-08-22 10:29:26 +0200 |
| commit | 3815c491a6ec6834d60a651c192900d49669905b (patch) | |
| tree | 848e1c4227f47b480aa993ce7f00a3ed1832a64a | |
| parent | 2e531ad27bfbb3654ae8891b908964c7b2921c35 (diff) | |
| download | cgeo-3815c491a6ec6834d60a651c192900d49669905b.zip cgeo-3815c491a6ec6834d60a651c192900d49669905b.tar.gz cgeo-3815c491a6ec6834d60a651c192900d49669905b.tar.bz2 | |
Fix #235
| -rw-r--r-- | src/cgeo/geocaching/cgBase.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/cgeo/geocaching/cgBase.java b/src/cgeo/geocaching/cgBase.java index f9ee8c2..c0e093d 100644 --- a/src/cgeo/geocaching/cgBase.java +++ b/src/cgeo/geocaching/cgBase.java @@ -94,7 +94,7 @@ public class cgBase { private final static Pattern patternCountLogs = Pattern.compile("<span id=\"ctl00_ContentBody_lblFindCounts\"><p>(.*)<\\/p><\\/span>", Pattern.CASE_INSENSITIVE); private final static Pattern patternCountLog = Pattern.compile(" src=\"\\/images\\/icons\\/([^\\.]*).gif\" alt=\"[^\"]*\" title=\"[^\"]*\" />([0-9]*)[^0-9]+", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE); //private final static Pattern patternLogs = Pattern.compile("<table class=\"LogsTable\">(.*?)</table>\\s*<p", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE); - private final static Pattern patternLog = Pattern.compile("<tr><td class.+?<a href=\"/profile/\\?guid=.+?>(.+?)</a>.+?logOwnerStats.+?guid.+?>(\\d+)</a>.+?LogType.+?<img.+?/images/icons/([^\\.]+)\\..+?title=\"(.+?)\".+?LogDate.+?>(.+?)<.+?LogText.+?>(.*?)</p>(.*?)</div></div></div></td></tr>", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE); + private final static Pattern patternLog = Pattern.compile("<tr><td class.+?<a href=\"/profile/\\?guid=.+?>(.+?)</a>.+?(?:logOwnerStats.+?guid.+?>(\\d+)</a>.+?)?LogType.+?<img.+?/images/icons/([^\\.]+)\\..+?title=\"(.+?)\".+?LogDate.+?>(.+?)<.+?LogText.+?>(.*?)</p>(.*?)</div></div></div></td></tr>", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE); private final static Pattern patternLogImgs = Pattern.compile("href=\"(http://img.geocaching.com/cache/log/.+?)\".+?<span>([^<]*)", Pattern.CASE_INSENSITIVE); private final static Pattern patternAttributes = Pattern.compile("<h3 class=\"WidgetHeader\">[^<]*<img[^>]+>\\W*Attributes[^<]*</h3>[^<]*<div class=\"WidgetBody\">(([^<]*<img src=\"[^\"]+\" alt=\"[^\"]+\"[^>]*>)+)[^<]*<p", Pattern.CASE_INSENSITIVE); private final static Pattern patternAttributesInside = Pattern.compile("[^<]*<img src=\"([^\"]+)\" alt=\"([^\"]+)\"[^>]*>", Pattern.CASE_INSENSITIVE); @@ -1641,7 +1641,10 @@ public class cgBase { logDone.author = Html.fromHtml(matcherLog.group(1)).toString(); - logDone.found = Integer.parseInt(matcherLog.group(2)); + if (null != matcherLog.group(2)) + { + logDone.found = Integer.parseInt(matcherLog.group(2)); + } logDone.log = matcherLog.group(6); |