some fixes

[DHBWCampusApp.git] / app / src / main / java / de / dhbwloe / campusapp / mensaplan / MensaplanManager.java

diff --git a/app/src/main/java/de/dhbwloe/campusapp/mensaplan/MensaplanManager.java b/app/src/main/java/de/dhbwloe/campusapp/mensaplan/MensaplanManager.java
index 932673d8392ff315664806345df076be03044f1b..251c36cdf5557577950aff738a6c28c6ce6dea40 100644 (file)
--- a/app/src/main/java/de/dhbwloe/campusapp/mensaplan/MensaplanManager.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/mensaplan/MensaplanManager.java
@@ -12,12 +12,13 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import de.dhbwloe.campusapp.CampusAppContext;
 import de.dhbwloe.campusapp.network.XmlEntry;
 import de.dhbwloe.campusapp.network.XmlRequestHelper;
 import de.dhbwloe.campusapp.search.SearchIndices;
-import de.dhbwloe.campusapp.vorlesungen.VorlesungsplanManagerInterface;
 
 /**
  * Created by pk910 on 22.01.2016.
@@ -55,16 +56,21 @@ public class MensaplanManager extends XmlRequestHelper {
     }
 
     private int getPriceFromString(String pricestr) {
-        // 2,90€
+        // 2,90€( pro 100g)?
         if(pricestr == null)
             return 0;
-        NumberFormat nf = NumberFormat.getInstance(Locale.GERMAN);
-        try {
-            Number result =  nf.parse(pricestr.replace("€", ""));
-            return (int)(result.doubleValue()*100);
-        } catch (ParseException e) {
+        Pattern r = Pattern.compile("^([0-9,]+)€( pro [0-9]+[a-z]+)$");
+        Matcher m = r.matcher(pricestr);
+        if (m.find()) {
+            NumberFormat nf = NumberFormat.getInstance(Locale.GERMAN);
+            try {
+                Number result =  nf.parse(m.group(1));
+                return (int)(result.doubleValue()*100);
+            } catch (ParseException e) {
+                return 0;
+            }
+        } else
             return 0;
-        }
     }
 
     @Override