new: LOC files import

2 files changed, 7 insertions, 6 deletions

diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index d09d63c..73cb8cf 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -949,6 +949,9 @@
 
   <!-- changelog -->
   <string name="changelog">\n
+    <b>next version</b>\n
+    · new: import of LOC files\n
+    \n\n
     <b>18.09.2011</b>\n
     · fix: Android 3+ compatibility\n
     \n\n
diff --git a/main/src/cgeo/geocaching/files/LocParser.java b/main/src/cgeo/geocaching/files/LocParser.java
index 3bb69cd..12cb1e7 100644
--- a/main/src/cgeo/geocaching/files/LocParser.java
+++ b/main/src/cgeo/geocaching/files/LocParser.java
@@ -86,11 +86,8 @@ public final class LocParser extends FileParser {
             final Matcher matcherName = patternName.matcher(pointString);
             if (matcherName.find()) {
                 String name = matcherName.group(1).trim();
-                int pos = name.indexOf(" by ");
-                if (pos > 0) {
-                    name = name.substring(0, pos).trim();
-                }
-                pointCoord.name = name;
+                pointCoord.name = StringUtils.substringBeforeLast(name, " by ").trim();
+                // owner = StringUtils.substringAfterLast(" by ").trim();
             }
             final Matcher matcherLat = patternLat.matcher(pointString);
             final Matcher matcherLon = patternLon.matcher(pointString);
@@ -158,8 +155,9 @@ public final class LocParser extends FileParser {
                 caches.cacheList.add(cache);
 
                 fixCache(cache);
+                cache.type = "traditional"; // type is not given in the LOC file
                 cache.reason = listId;
-                cache.detailed = false;
+                cache.detailed = true;
 
                 cgeoapplication.getInstance().addCacheToSearch(search, cache);
             }