Changeset 1718

Timestamp:

09/15/04 08:58:25 (20 years ago)

Author:

jalet

Message:

User groups membership and printer groups membership can now be dumped too

Location:

pykota/trunk

Files:

• bin/dumpykota (modified) (4 diffs)
• pykota/storages/sql.py (modified) (2 diffs)

pykota/trunk/bin/dumpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.3  2004/09/15 06:58:25  jalet
+# User groups membership and printer groups membership can now be dumped too
+#
 # Revision 1.2  2004/09/14 22:29:12  jalet
 # First version of dumpykota. Works fine but only with PostgreSQL backend
@@ -65 +68 @@
                          - gquotas : dump user groups quotas.
                          - payments : dumps user payments.
+                         - pmembers : dumps printer groups members.
+                         - umembers : dumps user groups members.
                          
                        NB : the -d | --data command line option   
@@ -106 +111 @@
                              "gpquotas",
                              "payments",
+                             "pmembers",
+                             "umembers",
                            ] :
             raise PyKotaToolError, _("Invalid modifier [%s] for --data command line option, see help.") % datatype
@@ -117 +124 @@
             
         entries = getattr(self.storage, "extract%s" % datatype.title())()    
-        getattr(self, "dump%s" % format.title())(entries)
+        if entries is not None :
+            getattr(self, "dump%s" % format.title())(entries)
         return 0
         

pykota/trunk/pykota/storages/sql.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.46  2004/09/15 06:58:25  jalet
+# User groups membership and printer groups membership can now be dumped too
+#
 # Revision 1.45  2004/09/14 22:29:13  jalet
 # First version of dumpykota. Works fine but only with PostgreSQL backend
@@ -104 +107 @@
         """Extracts all grouppquota records."""
         result = self.doRawSearch("SELECT groups.groupname,printers.printername,grouppquota.* FROM groups,printers,grouppquota WHERE groups.id=grouppquota.groupid AND printers.id=grouppquota.printerid")
+        return self.prepareRawResult(result)
+        
+    def extractUmembers(self) :
+        """Extracts all user groups members."""
+        result = self.doRawSearch("SELECT groups.groupname, users.username, groupsmembers.* FROM groups,users,groupsmembers WHERE users.id=groupsmembers.userid AND groups.id=groupsmembers.groupid")
+        return self.prepareRawResult(result)
+        
+    def extractPmembers(self) :
+        """Extracts all printer groups members."""
+        result = self.doRawSearch("SELECT p1.printername as pgroupname, p2.printername as printername, printergroupsmembers.* FROM printers p1, printers p2, printergroupsmembers WHERE p1.id=printergroupsmembers.groupid AND p2.id=printergroupsmembers.printerid")
         return self.prepareRawResult(result)