Changeset 2644

Timestamp:

02/03/06 15:14:08 (18 years ago)

Author:

jerome

Message:

Changed copyright messages' years

Files:

• pykota/trunk/pykota/storages/mysqlstorage.py (modified) (7 diffs)

pykota/trunk/pykota/storages/mysqlstorage.py

@@ -4 +4 @@
 # PyKota : Print Quotas for CUPS and LPRng
 #
-# (c) 2003-2004 Jerome Alet <alet@librelogiciel.com>
-# (c) 2005 Matt Hyclak <hyclak@math.ohiou.edu>
+# (c) 2003, 2004, 2005, 2006 Jerome Alet <alet@librelogiciel.com>
+# (c) 2005, 2006 Matt Hyclak <hyclak@math.ohiou.edu>
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -42 +42 @@
             port = int(port)
         except ValueError :    
-            port = -1           # Use the default MySQL port
+            port = -1           # Use the default MySQL port
         
         self.tool.logdebug("Trying to open database (host=%s, port=%s, dbname=%s, user=%s)..." % (host, port, dbname, user))
         self.database = MySQLdb.connect(host=host, port=port, db=dbname, user=user, passwd=passwd)
-        self.cursor = self.database.cursor()
+        self.cursor = self.database.cursor()
         self.closed = 0
         self.tool.logdebug("Database opened (host=%s, port=%s, dbname=%s, user=%s)" % (host, port, dbname, user))
@@ -53 +53 @@
         """Closes the database connection."""
         if not self.closed :
-            self.cursor.close()
+            self.cursor.close()
             self.database.close()
             self.closed = 1
@@ -84 +84 @@
             raise PyKotaStorageError, str(msg)
         else :    
-            # This returns a list of lists. Integers are returned as longs.
+            # This returns a list of lists. Integers are returned as longs.
             return self.cursor.fetchall()
             
@@ -90 +90 @@
         """Does a search query."""
         result = self.doRawSearch(query)
-        if result :
-            rows = []
+        if result :
+            rows = []
             fields = {}
             for i in range(len(self.cursor.description)) :
-                fields[i] = self.cursor.description[i][0]
-            for row in result :
+                fields[i] = self.cursor.description[i][0]
+            for row in result :
                 rowdict = {}
                 for field in fields.keys() :
-                    value = row[field]
-                    try :
-                        value = value.encode("UTF-8")
-                    except:
-                        pass
-                    rowdict[fields[field]] = value
-                rows.append(rowdict)
-            # returns a list of dicts
-            return rows
+                    value = row[field]
+                    try :
+                        value = value.encode("UTF-8")
+                    except:
+                        pass
+                    rowdict[fields[field]] = value
+                rows.append(rowdict)
+            # returns a list of dicts
+            return rows
 
     def doModify(self, query) :
@@ -130 +130 @@
             return (self.database.string_literal(field)).encode("UTF-8")
         else :
-            self.tool.logdebug("WARNING: field has no type, returning NULL")
+            self.tool.logdebug("WARNING: field has no type, returning NULL")
             return "NULL"
 
@@ -137 +137 @@
         if result :
             entries = [tuple([f[0] for f in self.cursor.description])]
-            for entry in result :
+            for entry in result :
                 row = []
                 for value in entry :