1 files changed, 27 insertions, 23 deletions

diff --git a/main/src/cgeo/geocaching/files/LocParser.java b/main/src/cgeo/geocaching/files/LocParser.java
index b17b203..730e224 100644
--- a/main/src/cgeo/geocaching/files/LocParser.java
+++ b/main/src/cgeo/geocaching/files/LocParser.java
@@ -2,13 +2,14 @@ package cgeo.geocaching.files;
 
 import cgeo.geocaching.SearchResult;
 import cgeo.geocaching.cgCache;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.cgData;
 import cgeo.geocaching.enumerations.CacheSize;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.LoadFlags;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.utils.CancellableHandler;
 import cgeo.geocaching.utils.Log;
+import cgeo.geocaching.utils.MatcherWrapper;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -22,7 +23,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public final class LocParser extends FileParser {
@@ -65,7 +65,7 @@ public final class LocParser extends FileParser {
                 contained.add(geocode);
             }
         }
-        Set<cgCache> caches = cgeoapplication.getInstance().loadCaches(contained, LoadFlags.LOAD_CACHE_OR_DB);
+        Set<cgCache> caches = cgData.loadCaches(contained, LoadFlags.LOAD_CACHE_OR_DB);
         for (cgCache cache : caches) {
             cgCache coord = cidCoords.get(cache.getGeocode());
             copyCoordToCache(coord, cache);
@@ -77,7 +77,7 @@ public final class LocParser extends FileParser {
         cache.setDifficulty(coord.getDifficulty());
         cache.setTerrain(coord.getTerrain());
         cache.setSize(coord.getSize());
-        cache.setGeocode(coord.getGeocode().toUpperCase());
+        cache.setGeocode(coord.getGeocode());
         cache.setReliableLatLon(true);
         if (StringUtils.isBlank(cache.getName())) {
             cache.setName(coord.getName());
@@ -140,6 +140,7 @@ public final class LocParser extends FileParser {
             cache.setType(CacheType.UNKNOWN); // type is not given in the LOC file
             cache.setListId(listId);
             cache.setDetailed(true);
+            cache.store(null);
         }
         Log.i("Caches found in .loc file: " + caches.size());
         return caches;
@@ -147,13 +148,12 @@ public final class LocParser extends FileParser {
 
     public static cgCache parseCache(final String pointString) {
         final cgCache cache = new cgCache();
-        final Matcher matcherGeocode = patternGeocode.matcher(pointString);
+        final MatcherWrapper matcherGeocode = new MatcherWrapper(patternGeocode, pointString);
         if (matcherGeocode.find()) {
-            final String geocode = matcherGeocode.group(1).trim().toUpperCase();
-            cache.setGeocode(geocode.toUpperCase());
+            cache.setGeocode(matcherGeocode.group(1).trim());
         }
 
-        final Matcher matcherName = patternName.matcher(pointString);
+        final MatcherWrapper matcherName = new MatcherWrapper(patternName, pointString);
         if (matcherName.find()) {
             final String name = matcherName.group(1).trim();
             cache.setName(StringUtils.substringBeforeLast(name, " by ").trim());
@@ -161,28 +161,32 @@ public final class LocParser extends FileParser {
             cache.setName(cache.getGeocode());
         }
 
-        final Matcher matcherLat = patternLat.matcher(pointString);
-        final Matcher matcherLon = patternLon.matcher(pointString);
+        final MatcherWrapper matcherLat = new MatcherWrapper(patternLat, pointString);
+        final MatcherWrapper matcherLon = new MatcherWrapper(patternLon, pointString);
         if (matcherLat.find() && matcherLon.find()) {
             cache.setCoords(parsePoint(matcherLat.group(1).trim(), matcherLon.group(1).trim()));
         }
 
-        final Matcher matcherDifficulty = patternDifficulty.matcher(pointString);
-        if (matcherDifficulty.find()) {
-            cache.setDifficulty(Float.parseFloat(matcherDifficulty.group(1).trim()));
-        }
+        final MatcherWrapper matcherDifficulty = new MatcherWrapper(patternDifficulty, pointString);
+        try {
+            if (matcherDifficulty.find()) {
+                cache.setDifficulty(Float.parseFloat(matcherDifficulty.group(1).trim()));
+            }
 
-        final Matcher matcherTerrain = patternTerrain.matcher(pointString);
-        if (matcherTerrain.find()) {
-            cache.setTerrain(Float.parseFloat(matcherTerrain.group(1).trim()));
-        }
+            final MatcherWrapper matcherTerrain = new MatcherWrapper(patternTerrain, pointString);
+            if (matcherTerrain.find()) {
+                cache.setTerrain(Float.parseFloat(matcherTerrain.group(1).trim()));
+            }
 
-        final Matcher matcherContainer = patternContainer.matcher(pointString);
-        if (matcherContainer.find()) {
-            final int size = Integer.parseInt(matcherContainer.group(1).trim());
-            if (size >= 1 && size <= 8) {
-                cache.setSize(SIZES[size - 1]);
+            final MatcherWrapper matcherContainer = new MatcherWrapper(patternContainer, pointString);
+            if (matcherContainer.find()) {
+                final int size = Integer.parseInt(matcherContainer.group(1).trim());
+                if (size >= 1 && size <= 8) {
+                    cache.setSize(SIZES[size - 1]);
+                }
             }
+        } catch (NumberFormatException e) {
+            Log.e("LocParser.parseCache", e);
         }
 
         return cache;