This commit is contained in:
Miroslav Stampar 2015-12-06 23:24:09 +01:00
parent 7517e64417
commit d5e6be41db

View File

@ -64,15 +64,19 @@ def pivotDumpTable(table, colList, count=None, blind=True):
colList = filter(None, sorted(colList, key=lambda x: len(x) if x else MAX_INT)) colList = filter(None, sorted(colList, key=lambda x: len(x) if x else MAX_INT))
if conf.pivotColumn: if conf.pivotColumn:
if any(re.search(r"(.+\.)?%s" % re.escape(conf.pivotColumn), _, re.I) for _ in colList): for _ in colList:
infoMsg = "using column '%s' as a pivot " % conf.pivotColumn if re.search(r"(.+\.)?%s" % re.escape(conf.pivotColumn), _, re.I):
infoMsg += "for retrieving row data" infoMsg = "using column '%s' as a pivot " % conf.pivotColumn
logger.info(infoMsg) infoMsg += "for retrieving row data"
logger.info(infoMsg)
validPivotValue = True colList.remove(_)
colList.remove(conf.pivotColumn) colList.insert(0, _)
colList.insert(0, conf.pivotColumn)
else: validPivotValue = True
break
if not validPivotValue:
warnMsg = "column '%s' not " % conf.pivotColumn warnMsg = "column '%s' not " % conf.pivotColumn
warnMsg += "found in table '%s'" % table warnMsg += "found in table '%s'" % table
logger.warn(warnMsg) logger.warn(warnMsg)