fix/upgrade/chicken soup

This commit is contained in:
Miroslav Stampar 2010-10-20 09:54:17 +00:00
parent e24bff0497
commit 00449f1402
2 changed files with 7 additions and 3 deletions

View File

@ -81,9 +81,9 @@ def setHandler():
continue continue
handler = dbmsMap() kb.misc.handler = handler = dbmsMap()
conf.dbmsConnector = dbmsConn() conf.dbmsConnector = dbmsConn()
if conf.direct: if conf.direct:
logger.debug("forcing timeout to 10 seconds") logger.debug("forcing timeout to 10 seconds")
conf.timeout = 10 conf.timeout = 10

View File

@ -43,6 +43,8 @@ def errorUse(expression, resumeValue=True):
startLimiter = "" startLimiter = ""
endLimiter = "" endLimiter = ""
expressionUnescaped = expression
if resumeValue: if resumeValue:
output = resume(expression, payload) output = resume(expression, payload)
else: else:
@ -61,7 +63,9 @@ def errorUse(expression, resumeValue=True):
startLimiter = unescaper.unescape("'%s'" % ERROR_START_CHAR) startLimiter = unescaper.unescape("'%s'" % ERROR_START_CHAR)
endLimiter = unescaper.unescape("'%s'" % ERROR_END_CHAR) endLimiter = unescaper.unescape("'%s'" % ERROR_END_CHAR)
else: else:
expressionUnescaped = unescaper.unescape(expression) expressionUnescaped = kb.misc.handler.unescape(expression)
startLimiter = kb.misc.handler.unescape("'%s'" % ERROR_START_CHAR)
endLimiter = kb.misc.handler.unescape("'%s'" % ERROR_END_CHAR)
debugMsg = "query: %s" % expressionUnescaped debugMsg = "query: %s" % expressionUnescaped
logger.debug(debugMsg) logger.debug(debugMsg)