it's a must after all - partial union is specific and as there is no output for fetched value, we have to display something to the user. also, there is a bug fix (removed the leftover parseUnionPage)

This commit is contained in:
Miroslav Stampar 2011-03-25 21:31:26 +00:00
parent 48c4460e2c
commit 1119a85f39

View File

@ -13,6 +13,8 @@ import time
from lib.core.agent import agent from lib.core.agent import agent
from lib.core.common import Backend from lib.core.common import Backend
from lib.core.common import calculateDeltaSeconds from lib.core.common import calculateDeltaSeconds
from lib.core.common import clearConsoleLine
from lib.core.common import dataToStdout
from lib.core.common import extractRegexResult from lib.core.common import extractRegexResult
from lib.core.common import filterStringValue from lib.core.common import filterStringValue
from lib.core.common import getUnicode from lib.core.common import getUnicode
@ -248,7 +250,15 @@ def unionUse(expression, unpack=True, dump=False):
if output: if output:
value += output value += output
parseUnionPage(output, limitedExpr)
if conf.verbose == 1:
length = stopLimit - startLimit
count = num - startLimit + 1
status = '%d/%d entries (%d%s)' % (count, length, round(100.0*count/length), '%')
dataToStdout("\r[%s] [INFO] retrieved: %s" % (time.strftime("%X"), status), True)
if conf.verbose == 1:
clearConsoleLine(True)
except KeyboardInterrupt: except KeyboardInterrupt:
print print