From fd209cf2c470d322ced32b90cf31cd00387d28a4 Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Tue, 16 Aug 2011 18:42:27 +0300 Subject: [PATCH] Replace tabs with spaces. Remove trailing white spaces. --- ppf/db/DatabaseAccess.py | 60 ++++++++++++++++++------------------- ppf/db/DatabaseCommander.py | 4 +-- ppf/db/DatabaseWriter.py | 2 +- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ppf/db/DatabaseAccess.py b/ppf/db/DatabaseAccess.py index fd117d8..527a02e 100644 --- a/ppf/db/DatabaseAccess.py +++ b/ppf/db/DatabaseAccess.py @@ -18,16 +18,16 @@ class DatabaseAccess: arguments """ operators={'eq':'=', 'neq':'<>', 'gt':'>', 'gte':'>=', 'lt':'<', 'lte':'<=', 'lk':'LIKE'} - + def __init__ (self, dbname): self.dbname = dbname def connect(self): - if not os.path.isfile(self.dbname): - return False + if not os.path.isfile(self.dbname): + return False self.conn = sqlite3.connect(self.dbname) self.cursor = self.conn.cursor() - return True + return True def disconnect(self): self.cursor.close() @@ -218,19 +218,19 @@ class DatabaseAccess: if cs_id == -1: self.cursor.execute("select * from status_messages") else: - values = (cs_id, ) - query = "select * from status_messages where cs_id=? and " - - if restrictArray: - for (key, value, op) in restrictArray: - query += "%s %s ? and " % (key, self.operators[op]) - values += (value, ) - - query = query.strip('and ') - print query, values - self.cursor.execute(query, values) - - if show == True: + values = (cs_id, ) + query = "select * from status_messages where cs_id=? and " + + if restrictArray: + for (key, value, op) in restrictArray: + query += "%s %s ? and " % (key, self.operators[op]) + values += (value, ) + + query = query.strip('and ') + print query, values + self.cursor.execute(query, values) + + if show == True: for row in self.cursor: print row else: @@ -259,24 +259,24 @@ class DatabaseAccess: def insert_verbose_messages(self, cs_id, timestamp, direction, peer_ip, peer_port, message_type, _index, begin, length, listen_port): self.insert_verbose_messages_row([cs_id, timestamp, direction, peer_ip, peer_port, message_type, _index, begin, length, listen_port]) - + def select_verbose_messages(self, show = True, cs_id = -1, restrictArray=None): try: if cs_id == -1: self.cursor.execute("select * from verbose_messages") else: - values = (cs_id, ) - query = "select * from verbose_messages where cs_id=? and " - if restrictArray: - for (key, value, op) in restrictArray: - query += "%s %s ? and " % (key, self.operators[op]) - values += (value, ) - - query = query.strip('and ') - #print query, values - self.cursor.execute(query, values) - - if show == True: + values = (cs_id, ) + query = "select * from verbose_messages where cs_id=? and " + if restrictArray: + for (key, value, op) in restrictArray: + query += "%s %s ? and " % (key, self.operators[op]) + values += (value, ) + + query = query.strip('and ') + #print query, values + self.cursor.execute(query, values) + + if show == True: for row in self.cursor: print row else: diff --git a/ppf/db/DatabaseCommander.py b/ppf/db/DatabaseCommander.py index f5678ba..c1dbaf6 100644 --- a/ppf/db/DatabaseCommander.py +++ b/ppf/db/DatabaseCommander.py @@ -113,7 +113,7 @@ def read_swarms(dbc, sep = None): line = sys.stdin.readline().strip() if line: message_array = line.split(sep) - + swarm_name = message_array[0].strip() filesize = int(message_array[1].strip()) purpose = message_array[2].strip() @@ -131,7 +131,7 @@ def read_client_sessions(dbc, sep = None): line = sys.stdin.readline().strip() if line: message_array = line.split(sep) - + swarm_id = int(message_array[0].strip()) client_name = message_array[1].strip() system_os = message_array[2].strip() diff --git a/ppf/db/DatabaseWriter.py b/ppf/db/DatabaseWriter.py index 8d6a272..1be3737 100644 --- a/ppf/db/DatabaseWriter.py +++ b/ppf/db/DatabaseWriter.py @@ -79,7 +79,7 @@ def read_status_messages(dbw, sep = None): line = sys.stdin.readline().strip() if line: message_array = line.split(sep) - + cs_id = int(message_array[0].strip()) timestamp = message_array[1].strip().split(' ') date = timestamp[0] -- 2.20.1