Changeset 7055

Timestamp:

11/10/16 10:22:52 (8 years ago)

Author:

Oliver Schonefeld

Message:

• fix typo in RegexFlag? enum
• fix missing break statement in processing of 'l' regex flag
• raise parsing error in case of mutually exclusive regex flags

Location:

FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/parser

Files:

• Expression.java (modified) (1 diff)
• QueryParser.java (modified) (2 diffs)
• RegexFlag.java (modified) (1 diff)

FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/parser/Expression.java

@@ -132 +132 @@
         if (regex_flags != null) {
             sb.append("/");
-            if (regex_flags.contains(RegexFlag.CASE_INSENSITVE)) {
+            if (regex_flags.contains(RegexFlag.CASE_INSENSITIVE)) {
                 sb.append("i");
             }
-            if (regex_flags.contains(RegexFlag.CASE_SENSITVE)) {
+            if (regex_flags.contains(RegexFlag.CASE_SENSITIVE)) {
                 sb.append("I");
             }

FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/parser/QueryParser.java

@@ -580 +580 @@
                         /* $FALL-THROUGH$ */
                     case 'c':
-                        flags.add(RegexFlag.CASE_INSENSITVE);
+                        flags.add(RegexFlag.CASE_INSENSITIVE);
                         break;
                     case 'I':
                         /* $FALL-THROUGH$ */
                     case 'C':
-                        flags.add(RegexFlag.CASE_SENSITVE);
+                        flags.add(RegexFlag.CASE_SENSITIVE);
                         break;
                     case 'l':
                         flags.add(RegexFlag.LITERAL_MATCHING);
+                        break;
                     case 'd':
                         flags.add(RegexFlag.IGNORE_DIACRITICS);
@@ -594 +595 @@
                     default:
                         throw new ExpressionTreeBuilderException(
-                                "unexpected regex flag: " + s.charAt(i));
+                                "unknown regex modifier flag: " + s.charAt(i));
                     } // switch
                 }
-                // FIXME: validate flags? most combinations are mutually exclusive
+
+                // validate regex flags
+                if (flags.contains(RegexFlag.CASE_SENSITIVE) &&
+                        flags.contains(RegexFlag.CASE_INSENSITIVE)) {
+                    throw new ExpressionTreeBuilderException(
+                            "invalid combination of regex modifier flags: " +
+                            "'i' or 'c' and 'I' or 'C' are mutually exclusive");
+                }
+                if (flags.contains(RegexFlag.LITERAL_MATCHING) &&
+                            (flags.contains(RegexFlag.CASE_SENSITIVE) ||
+                             flags.contains(RegexFlag.CASE_INSENSITIVE) ||
+                             flags.contains(RegexFlag.IGNORE_DIACRITICS))) {
+                    throw new ExpressionTreeBuilderException(
+                            "invalid combination of regex modifier flags: 'l' " +
+                            "is mutually exclusive with 'i', 'c', 'I', 'C' or 'd'");
+                }
+
                 stack.push(flags);
             } else {

FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/parser/RegexFlag.java

@@ -25 +25 @@
      * case insensitive.
      */
-    CASE_INSENSITVE,
+    CASE_INSENSITIVE,
     /**
      * case sensitive.
      */
-    CASE_SENSITVE,
+    CASE_SENSITIVE,
     /**
      * match exactly (= literally).