further ms access improvements

This commit is contained in:
Miroslav Stampar 2010-12-26 02:13:56 +00:00
parent 2c8115eed9
commit e41acb6fc2

View File

@ -1228,9 +1228,9 @@ class Enumeration:
colList.insert(0, column) colList.insert(0, column)
break break
value = " " pivotValue = " "
for column in colList: for index in indexRange:
for index in indexRange: for column in colList:
if column not in lengths: if column not in lengths:
lengths[column] = 0 lengths[column] = 0
@ -1238,19 +1238,20 @@ class Enumeration:
entries[column] = [] entries[column] = []
if column == colList[0]: if column == colList[0]:
# Correction for values with unrecognized chars # Correction for pivotValues with unrecognized chars
if value and '?' in value and value[0]!='?': if pivotValue and '?' in pivotValue and pivotValue[0]!='?':
value = value.split('?')[0] pivotValue = pivotValue.split('?')[0]
value = value[:-1] + chr(ord(value[-1]) + 1) pivotValue = pivotValue[:-1] + chr(ord(pivotValue[-1]) + 1)
query = rootQuery.blind.query % (column, conf.tbl, column, value) query = rootQuery.blind.query % (column, conf.tbl, column, pivotValue)
else: else:
if index >= len(entries[colList[0]]): query = rootQuery.blind.query2 % (column, conf.tbl, colList[0], pivotValue)
break
query = rootQuery.blind.query2 % (column, conf.tbl, colList[0], entries[colList[0]][index])
value = inject.getValue(query, inband=False) value = inject.getValue(query, inband=False)
if column == colList[0] and not value: if column == colList[0]:
break if not value:
break
else:
pivotValue = value
lengths[column] = max(lengths[column], len(value)) lengths[column] = max(lengths[column], len(value))
entries[column].append(value) entries[column].append(value)