few just in case fixes (unarrayizeValue in dumpTable entries) and and some refactoring (unique is now not done for every union case but only if detected that there are duplicates in union test)

This commit is contained in:
Miroslav Stampar
2012-06-15 20:41:53 +00:00
parent 76c873a222
commit 06be7bbb18
10 changed files with 19 additions and 20 deletions

View File

@@ -1611,9 +1611,8 @@ class Enumeration:
entries = []
entriesCount = len(entries)
index = 0
for column in colList:
for index, column in enumerate(colList):
colLen = len(column)
if column not in kb.data.dumpedTable:
@@ -1626,7 +1625,7 @@ class Enumeration:
if isinstance(entry, basestring):
colEntry = entry
else:
colEntry = entry[index] if index < len(entry) else u''
colEntry = unArrayizeValue(entry[index]) if index < len(entry) else u''
colEntryLen = len({" ": NULL, "": BLANK}.get(getUnicode(colEntry), getUnicode(colEntry)))
maxLen = max(colLen, colEntryLen)
@@ -1636,8 +1635,6 @@ class Enumeration:
kb.data.dumpedTable[column]["values"].append(colEntry)
index += 1
if not kb.data.dumpedTable and isInferenceAvailable() and not conf.direct:
infoMsg = "fetching number of "
if conf.col: