minor update

This commit is contained in:
Miroslav Stampar 2011-02-19 09:40:41 +00:00
parent 72fc0a0565
commit de7ca5a27c

View File

@ -1130,30 +1130,29 @@ class Enumeration:
validColumnList = False validColumnList = False
validPivotValue = False validPivotValue = False
if len(colList) > 1: for column in colList:
for column in colList: infoMsg = "fetching number of distinct "
infoMsg = "fetching number of distinct " infoMsg += "values for column '%s'" % column
infoMsg += "values for column '%s'" % column logger.info(infoMsg)
logger.info(infoMsg)
query = dumpNode.count2 % (column, table) query = dumpNode.count2 % (column, table)
if blind: if blind:
value = inject.getValue(query, inband=False, error=False) value = inject.getValue(query, inband=False, error=False)
else: else:
value = inject.getValue(query, blind=False) value = inject.getValue(query, blind=False)
if isNumPosStrValue(value): if isNumPosStrValue(value):
validColumnList = True validColumnList = True
if value == count: if value == count:
infoMsg = "using column '%s' as a pivot " % column infoMsg = "using column '%s' as a pivot " % column
infoMsg += "for retrieving row data" infoMsg += "for retrieving row data"
logger.info(infoMsg) logger.info(infoMsg)
validPivotValue = True validPivotValue = True
colList.remove(column) colList.remove(column)
colList.insert(0, column) colList.insert(0, column)
break break
if not validColumnList: if not validColumnList:
errMsg = "all column name(s) provided are non-existent" errMsg = "all column name(s) provided are non-existent"
@ -1167,7 +1166,7 @@ class Enumeration:
pivotValue = " " pivotValue = " "
breakRetrieval = False breakRetrieval = False
for i in xrange(count): for i in xrange(int(count)):
if breakRetrieval: if breakRetrieval:
break break
@ -1376,7 +1375,7 @@ class Enumeration:
elif DBMS.SYBASE: elif DBMS.SYBASE:
table = "%s..%s" % (conf.db, conf.tbl) table = "%s..%s" % (conf.db, conf.tbl)
entries, lengths = self.__pivotDumpTable(rootQuery.blind, table, colList, int(count), blind=True) entries, lengths = self.__pivotDumpTable(rootQuery.blind, table, colList, count, blind=True)
else: else:
if Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.MSSQL, DBMS.SYBASE): if Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.MSSQL, DBMS.SYBASE):