minor improvement for special cases with --string/--regexp

stamparm · stamparm · commit 15d72ec56605 · 2011-06-10T23:05:47.000Z
diff --git a/lib/request/comparison.py b/lib/request/comparison.py
@@ -34,17 +34,21 @@ def comparison(page, getRatioValue=False, pageLength=None):
     seqMatcher = getCurrentThreadData().seqMatcher
     seqMatcher.set_seq1(kb.pageTemplate)
 
-    if page:
-        # String to match in page when the query is valid
-        if conf.string:
-            condition = conf.string in page
-            return condition if not getRatioValue else (MAX_RATIO if condition else MIN_RATIO)
-
-        # Regular expression to match in page when the query is valid
-        if conf.regexp:
-            condition = re.search(conf.regexp, page, re.I | re.M) is not None
-            return condition if not getRatioValue else (MAX_RATIO if condition else MIN_RATIO)
+    if any([conf.string, conf.regexp]):
+        if page:
+            # String to match in page when the query is valid
+            if conf.string:
+                condition = conf.string in page
+                return condition if not getRatioValue else (MAX_RATIO if condition else MIN_RATIO)
+
+            # Regular expression to match in page when the query is valid
+            if conf.regexp:
+                condition = re.search(conf.regexp, page, re.I | re.M) is not None
+                return condition if not getRatioValue else (MAX_RATIO if condition else MIN_RATIO)
+        else:
+            return None
 
+    if page:
         # In case of an DBMS error page return None
         if kb.errorIsNone and (wasLastRequestDBMSError() or wasLastRequestHTTPError()):
             return None
