From 35fb50a6eefa51b03d7079963da3e2b6a5e086fa Mon Sep 17 00:00:00 2001 From: Bernardo Damele Date: Mon, 17 Jan 2011 22:56:04 +0000 Subject: [PATCH] Major bug fix --- lib/core/agent.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/core/agent.py b/lib/core/agent.py index 7c870cbf9..227113670 100644 --- a/lib/core/agent.py +++ b/lib/core/agent.py @@ -425,8 +425,8 @@ class Agent: if fieldsSelectFrom: concatenatedQuery = concatenatedQuery.replace("SELECT ", "CONCAT('%s'," % kb.misc.start, 1) concatenatedQuery = concatenatedQuery.replace(" FROM ", ",'%s') FROM " % kb.misc.stop, 1) - elif (fieldsSelect, fieldsSelectCase): - concatenatedQuery = concatenatedQuery.replace("SELECT ", "CONCAT('%s'," % kb.misc.start, 1) + elif fieldsSelect or fieldsSelectCase: + concatenatedQuery = concatenatedQuery.replace("SELECT ", "CONCAT('%s'," % kb.misc.start, 1) concatenatedQuery += ",'%s')" % kb.misc.stop elif fieldsNoSelect: concatenatedQuery = "CONCAT('%s',%s,'%s')" % (kb.misc.start, concatenatedQuery, kb.misc.stop) @@ -435,7 +435,7 @@ class Agent: if fieldsSelectFrom: concatenatedQuery = concatenatedQuery.replace("SELECT ", "'%s'||" % kb.misc.start, 1) concatenatedQuery = concatenatedQuery.replace(" FROM ", "||'%s' FROM " % kb.misc.stop, 1) - elif (fieldsSelect, fieldsSelectCase): + elif fieldsSelect or fieldsSelectCase: concatenatedQuery = concatenatedQuery.replace("SELECT ", "'%s'||" % kb.misc.start, 1) concatenatedQuery += "||'%s'" % kb.misc.stop elif fieldsNoSelect: @@ -452,7 +452,7 @@ class Agent: elif fieldsSelectFrom: concatenatedQuery = concatenatedQuery.replace("SELECT ", "'%s'+" % kb.misc.start, 1) concatenatedQuery = concatenatedQuery.replace(" FROM ", "+'%s' FROM " % kb.misc.stop, 1) - elif (fieldsSelect, fieldsSelectCase): + elif fieldsSelect or fieldsSelectCase: concatenatedQuery = concatenatedQuery.replace("SELECT ", "'%s'+" % kb.misc.start, 1) concatenatedQuery += "+'%s'" % kb.misc.stop elif fieldsNoSelect: