diff options
| author | rsudev <rasch@munin-soft.de> | 2012-12-12 08:44:45 +0100 |
|---|---|---|
| committer | rsudev <rasch@munin-soft.de> | 2012-12-12 08:44:45 +0100 |
| commit | a656756927cca6fb9d2d54afb3dfaab58946af68 (patch) | |
| tree | 2c0a2b266ea159c689ed6c9fa74aab05136ff675 /main | |
| parent | cc56e6a20660741a3edeaa64f18c19b0b27e8dee (diff) | |
| parent | ad25d93b32ad899db93ac87fce8ec9c620a6d147 (diff) | |
| download | cgeo-a656756927cca6fb9d2d54afb3dfaab58946af68.zip cgeo-a656756927cca6fb9d2d54afb3dfaab58946af68.tar.gz cgeo-a656756927cca6fb9d2d54afb3dfaab58946af68.tar.bz2 | |
Merge remote-tracking branch 'upstream/release' into issue2232m
Diffstat (limited to 'main')
| -rw-r--r-- | main/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/GCConstants.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index c0eb9a0..2a242ec 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -980,4 +980,5 @@ <item quantity="one">yesterday</item> <item quantity="other">%d days ago</item> </plurals> + ยท Opencaching.NL support in search function\n </resources> diff --git a/main/src/cgeo/geocaching/connector/gc/GCConstants.java b/main/src/cgeo/geocaching/connector/gc/GCConstants.java index a5d6b09..4dbd18f 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCConstants.java +++ b/main/src/cgeo/geocaching/connector/gc/GCConstants.java @@ -105,7 +105,7 @@ public final class GCConstants { public final static Pattern PATTERN_TRACKABLE_TYPE = Pattern.compile("<img id=\"ctl00_ContentBody_BugTypeImage\" class=\"TravelBugHeaderIcon\" src=\"[^\"]+\" alt=\"([^\"]+)\"[^>]*>"); public final static Pattern PATTERN_TRACKABLE_DISTANCE = Pattern.compile("<h4[^>]*\\W*Tracking History \\(([0-9.,]+(km|mi))[^\\)]*\\)"); public final static Pattern PATTERN_TRACKABLE_LOG = Pattern.compile("<tr class=\"Data BorderTop .+?src=\"/images/logtypes/([^.]+)\\.png[^>]+> ([^<]+)</td>.+?guid.+?>([^<]+)</a>.+?(?:guid=([^\"]+)\">(<span[^>]+>)?([^<]+)</.+?)?<td colspan=\"4\">(.+?)(?:<ul.+?ul>)?\\s*</td>\\s*</tr>"); - public final static Pattern PATTERN_TRACKABLE_LOG_IMAGES = Pattern.compile("<a href='([^\"]+)'.+?LogImgTitle.+?>([^<]+)</"); + public final static Pattern PATTERN_TRACKABLE_LOG_IMAGES = Pattern.compile("<li><a href=\"([^\"]+)\".+?LogImgTitle.+?>([^<]+)</"); /** * Patterns for parsing the result of a search (next) |