@@ -231,12 +231,12 @@ s += "now: " + self.sSentence + "\n" for dToken in self.lToken: s += '#{i}\t{nStart}:{nEnd}\t{sValue}\t{sType}'.format(**dToken) if "lMorph" in dToken: s += "\t" + str(dToken["lMorph"]) - if "tags" in dToken: - s += "\t" + str(dToken["tags"]) + if "aTags" in dToken: + s += "\t" + str(dToken["aTags"]) s += "\n" #for nPos, dToken in self.dTokenPos.items(): # s += "{}\t{}\n".format(nPos, dToken) return s @@ -341,12 +341,12 @@ self.sSentence = sSentence lNewToken = list(_oTokenizer.genTokens(sSentence, True)) for dToken in lNewToken: if "lMorph" in self.dTokenPos.get(dToken["nStart"], {}): dToken["lMorph"] = self.dTokenPos[dToken["nStart"]]["lMorph"] - if "tags" in self.dTokenPos.get(dToken["nStart"], {}): - dToken["tags"] = self.dTokenPos[dToken["nStart"]]["tags"] + if "aTags" in self.dTokenPos.get(dToken["nStart"], {}): + dToken["aTags"] = self.dTokenPos[dToken["nStart"]]["aTags"] self.lToken = lNewToken self.dTokenPos = { dToken["nStart"]: dToken for dToken in self.lToken if dToken["sType"] != "INFO" } if bDebug: echo("UPDATE:") echo(self) @@ -442,12 +442,12 @@ if bDebug: echo(" MATCH: @" + sRegex) yield { "iNode1": iNode1, "dNode": dGraph[dNode[""][sRegex]] } bTokenFound = True # token tags - if "tags" in dToken and "" in dNode: - for sTag in dToken["tags"]: + if "aTags" in dToken and "" in dNode: + for sTag in dToken["aTags"]: if sTag in dNode[""]: if bDebug: echo(" MATCH: /" + sTag) yield { "iNode1": iNode1, "dNode": dGraph[dNode[""][sTag]] } bTokenFound = True @@ -555,14 +555,14 @@ elif cActionType == "/": # Tag nTokenStart = nTokenOffset + eAct[0] if eAct[0] > 0 else nLastToken + eAct[0] nTokenEnd = nTokenOffset + eAct[1] if eAct[1] > 0 else nLastToken + eAct[1] for i in range(nTokenStart, nTokenEnd+1): - if "tags" in self.lToken[i]: - self.lToken[i]["tags"].update(sWhat.split("|")) + if "aTags" in self.lToken[i]: + self.lToken[i]["aTags"].update(sWhat.split("|")) else: - self.lToken[i]["tags"] = set(sWhat.split("|")) + self.lToken[i]["aTags"] = set(sWhat.split("|")) if bDebug: echo(" TAG: {} > [{}:{}]".format(sWhat, self.lToken[nTokenStart]["sValue"], self.lToken[nTokenEnd]["sValue"])) if sWhat not in self.dTags: self.dTags[sWhat] = [nTokenStart, nTokenStart] else: @@ -1037,11 +1037,11 @@ return True return False def g_tag (dToken, sTag): - return "tags" in dToken and sTag in dToken["tags"] + return "aTags" in dToken and sTag in dToken["aTags"] def g_space_between_tokens (dToken1, dToken2, nMin, nMax=None): nSpace = dToken2["nStart"] - dToken1["nEnd"] if nSpace < nMin: