Changeset 1244

Timestamp:

12/29/03 15:12:48 (21 years ago)

Author:

uid67467

Message:

Tries to workaround possible integrity violations when retrieving printer groups

Location:

pykota/trunk/pykota/storages

Files:

• ldapstorage.py (modified) (2 diffs)
• pgstorage.py (modified) (2 diffs)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.42  2003/12/29 14:12:48  uid67467
+# Tries to workaround possible integrity violations when retrieving printer groups
+#
 # Revision 1.41  2003/12/27 16:49:25  uid67467
 # Should be ok now.
@@ -567 +570 @@
         if result :
             for (printerid, fields) in result :
-                parentprinter = self.getPrinter(fields.get("pykotaPrinterName")[0])
-                if parentprinter.Exists :
-                    pgroups.append(parentprinter)
+                if printerid != printer.ident : # In case of integrity violation.
+                    parentprinter = self.getPrinter(fields.get("pykotaPrinterName")[0])
+                    if parentprinter.Exists :
+                        pgroups.append(parentprinter)
         return pgroups
         

pykota/trunk/pykota/storages/pgstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.26  2003/12/29 14:12:48  uid67467
+# Tries to workaround possible integrity violations when retrieving printer groups
+#
 # Revision 1.25  2003/12/27 16:49:25  uid67467
 # Should be ok now.
@@ -398 +401 @@
         """Get all the printer groups this printer is a member of."""
         pgroups = []
-        result = self.doSearch("SELECT printername FROM printergroupsmembers JOIN printers ON groupid=id WHERE printerid=%s;" % self.doQuote(printer.ident))
+        result = self.doSearch("SELECT groupid,printername FROM printergroupsmembers JOIN printers ON groupid=id WHERE printerid=%s;" % self.doQuote(printer.ident))
         if result :
             for record in result :
-                parentprinter = self.getPrinter(record.get("printername"))
-                if parentprinter.Exists :
-                    pgroups.append(parentprinter)
+                if record["groupid"] != printer.ident : # in case of integrity violation
+                    parentprinter = self.getPrinter(record.get("printername"))
+                    if parentprinter.Exists :
+                        pgroups.append(parentprinter)
         return pgroups