@@ -3,13 +3,13 @@ import os import traceback import pkgutil import re from functools import wraps -import datetime import time import json +import binascii #import logging #logging.basicConfig(filename="suggestions.log", level=logging.DEBUG) from . import str_transform as st @@ -146,22 +146,23 @@ self.sHeader = header.decode("utf-8") self.lArcVal = values.decode("utf-8").split("\t") self.nArcVal = len(self.lArcVal) self.byDic = bdic - l = info.decode("utf-8").split("/") - self.sLangCode = "xx" - self.sLangName = l[0] - self.sDicName = "" - self.nChar = int(l[1]) - self.nBytesArc = int(l[2]) - self.nBytesNodeAddress = int(l[3]) - self.nEntry = int(l[4]) - self.nNode = int(l[5]) - self.nArc = int(l[6]) - self.nAff = int(l[7]) - self.cStemming = l[8] + l = info.decode("utf-8").split("//") + self.sLangCode = l.pop(0) + self.sLangName = l.pop(0) + self.sDicName = l.pop(0) + self.sDate = l.pop(0) + self.nChar = int(l.pop(0)) + self.nBytesArc = int(l.pop(0)) + self.nBytesNodeAddress = int(l.pop(0)) + self.nEntry = int(l.pop(0)) + self.nNode = int(l.pop(0)) + self.nArc = int(l.pop(0)) + self.nAff = int(l.pop(0)) + self.cStemming = l.pop(0) self.nTag = self.nArcVal - self.nChar - self.nAff # to get the value of an arc, to get the char of an arc with its value self.dChar = {} for i in range(1, self.nChar): self.dChar[self.lArcVal[i]] = i @@ -189,11 +190,11 @@ "sHeader": "/pyfsa/", "sLangCode": self.sLangCode, "sLangName": self.sLangName, "sDicName": self.sDicName, "sFileName": self.sFileName, - "sDate": str(datetime.datetime.now())[:-7], + "sDate": time.strftime("%Y.%m.%d %H:%M"), "nEntry": self.nEntry, "nChar": self.nChar, "nAff": self.nAff, "nTag": self.nTag, "cStemming": self.cStemming,