aktualisiere RegEx: Unicode-Pfeil erkennen, Infos besser erkennen

1 files changed, 8 insertions, 6 deletions

diff --git a/www/js/index.js b/www/js/index.js
index 85245a1..8a93757 100644
--- a/www/js/index.js
+++ b/www/js/index.js
@@ -337,32 +337,34 @@ function parseVertretungen(str, username){
     /*
      * Abstandhalter [ ]*
      *
-     * ([\wäöü]+)
+     * ([\wäöü-]+)
      * Klasse
      *
+     * TODO offensichtlich kommt auch KlasseAlt -> KlasseNeu vor :T
+     *
      * (\d+(?:[ ]*-[ ]*\d+)?)
      * (Stunde x bis)? Stunde y
      *
      * (x?)
      * Entfall ja/nein
      *
-     * (?:(?:([\wäöü]+|\+)[ ]*->[ ]*([\wäöü]+|\+))|(?:()([\wäöü]+|\+)))
+     * (?:(?:([\wäöü]+|\+)[ ]*(?:→|->)[ ]*([\wäöü]+|\+))|(?:()([\wäöü]+|\+)))
      * Altes Fach -> Neues Fach | Neues Fach
      *
-     * (?:(?:(\d+|---)[ ]*->[ ]*(\d+|---))|(?:()(\d+|---)))
+     * (?:(?:(\d+|---)[ ]*(?:→|->)[ ]*(\d+|---))|(?:()(\d+|---)))
      * Alter Raum -> neuer Raum | neuer Raum
      *
      * ([\wäöü-]+|---|[+.])
      * Art-Text
      *
-     * (?:(?:([\wäöü]+|\+)[ ]*->[ ]*([\wäöü]+|\+))|(?:()([\wäöü]+|\+)))
+     * (?:(?:([\wäöü]+|\+)[ ]*(?:→|->)[ ]*([\wäöü]+|\+))|(?:()([\wäöü]+|\+)))
      * Alter Lehrer -> Neuer Lehrer | Neuer Lehrer
      *
-     * ([\wäöü-]*)
+     * ([\wäöü -]*)
      * Info-Text
      */
 
-    var vertretungenRe = /([\wäöü]+)[ ]+(\d+(?:[ ]*-[ ]*\d+)?)[ ]+(x?)[ ]*(?:(?:([\wäöü]+|\+)[ ]*->[ ]*([\wäöü]+|\+))|(?:()([\wäöü]+|\+)))[ ]+(?:(?:(\d+|---)[ ]*->[ ]*(\d+|---))|(?:()(\d+|---)))[ ]+([\wäöü-]+|---|[+.])[ ]+(?:(?:([\wäöü]+|\+)[ ]*->[ ]*([\wäöü]+|\+))|(?:()([\wäöü]+|\+)))[ ]*([\wäöü-]*)/i;
+    var vertretungenRe = /([\wäöü-]+)[ ]+(\d+(?:[ ]*-[ ]*\d+)?)[ ]+(x?)[ ]*(?:(?:([\wäöü]+|\+)[ ]*(?:→|->)[ ]*([\wäöü]+|\+))|(?:()([\wäöü]+|\+)))[ ]+(?:(?:(\d+|---)[ ]*(?:→|->)[ ]*(\d+|---))|(?:()(\d+|---)))[ ]+([\wäöü-]+|---|[+.])[ ]+(?:(?:([\wäöü]+|\+)[ ]*(?:→|->)[ ]*([\wäöü]+|\+))|(?:()([\wäöü]+|\+)))[ ]*([\wäöü -]*)/i;
     var res;
     var vertretungen = [];
     var nutzerklasse;