Merge branch 'main' into testing

2021-02-23 21:14:30 +01:00
parent d251ebb995 21d3ed61ef
commit fe04c1af25
1 changed files with 11 additions and 3 deletions
@@ -472,9 +472,17 @@ class NWIndex():
            return False

        sTitle = "T%06d" % nTitle
-        if sTitle in self._refIndex[tHandle] and theBits[0] != nwKeyWords.TAG_KEY:
-            for aVal in theBits[1:]:
-                self._refIndex[tHandle][sTitle]["tags"].append([nLine, theBits[0], aVal])
+        if sTitle not in self._refIndex[tHandle]:
+            return False
+
+        if theBits[0] == nwKeyWords.TAG_KEY:
+            return False
+
+        if theBits[0] not in nwKeyWords.VALID_KEYS:
+            return False
+
+        for aVal in theBits[1:]:
+            self._refIndex[tHandle][sTitle]["tags"].append([nLine, theBits[0], aVal])

        return True