quick fix

This commit is contained in:
Miroslav Stampar 2011-07-08 22:34:44 +00:00
parent 05cb65b106
commit 1e182e6c72

View File

@ -48,13 +48,22 @@ def setInjection(inj):
session file. session file.
""" """
condition = ( not kb.resumedQueries try:
or ( kb.resumedQueries.has_key(conf.url) and condition = ( not kb.resumedQueries
not kb.resumedQueries[conf.url].has_key("Injection data")) or ( kb.resumedQueries.has_key(conf.url) and
or ( kb.resumedQueries[conf.url].has_key("Injection data") not kb.resumedQueries[conf.url].has_key("Injection data"))
and intersect(base64unpickle(kb.resumedQueries[conf.url]["Injection data"][:-1]).data.keys(),\ or ( kb.resumedQueries[conf.url].has_key("Injection data")
inj.data.keys()) != inj.data.keys() and intersect(base64unpickle(kb.resumedQueries[conf.url]["Injection data"][:-1]).data.keys(),\
) ) inj.data.keys()) != inj.data.keys()
) )
except AttributeError:
warnMsg = "there were some changes in data model "
warnMsg += "preventing normal resume of previously stored "
warnMsg += "injection data. please use the --flush-session "
warnMsg += "to have it fixed"
singleTimeWarnMessage(warnMsg)
condition = False
if condition: if condition:
dataToSessionFile("[%s][%s][%s][Injection data][%s]\n" % (conf.url, inj.place, safeFormatString(conf.parameters[inj.place]), base64pickle(inj))) dataToSessionFile("[%s][%s][%s][Injection data][%s]\n" % (conf.url, inj.place, safeFormatString(conf.parameters[inj.place]), base64pickle(inj)))
@ -169,7 +178,7 @@ def resumeConfKb(expression, url, value):
if expression == "Injection data" and url == conf.url: if expression == "Injection data" and url == conf.url:
try: try:
injection = base64unpickle(value[:-1]) injection = base64unpickle(value[:-1])
except: except AttributeError:
warnMsg = "there were some changes in data model " warnMsg = "there were some changes in data model "
warnMsg += "preventing normal resume of previously stored " warnMsg += "preventing normal resume of previously stored "
warnMsg += "injection data. please use the --flush-session " warnMsg += "injection data. please use the --flush-session "