Changeset 729 for pykota/trunk/pykota

Timestamp:

02/07/03 00:20:03 (21 years ago)

Author:

jalet

Message:

warnpykota doesn't need any user/group name argument, mimicing the
warnquota disk quota tool.

Location:

pykota/trunk/pykota

Files:

• storages/sql.py (modified) (2 diffs)
• tool.py (modified) (3 diffs)

pykota/trunk/pykota/storages/sql.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.12  2003/02/06 23:20:03  jalet
+# warnpykota doesn't need any user/group name argument, mimicing the
+# warnquota disk quota tool.
+#
 # Revision 1.11  2003/02/06 15:05:13  jalet
 # self was forgotten
@@ -71 +75 @@
         return printerslist        
             
+    def getPrinterUsers(self, printername) :        
+        """Returns the list of usernames which uses a given printer."""
+        result = self.doQuery("SELECT DISTINCT username FROM users WHERE id IN (SELECT userid FROM userpquota WHERE printerid IN (SELECT printerid FROM printers WHERE printername=%s));" % self.doQuote(printername))
+        result = result.doParseResult(result)
+        if result is None :
+            return []
+        else :    
+            return [record["username"] for record in result]
+        
+    def getPrinterGroups(self, printername) :        
+        """Returns the list of groups which uses a given printer."""
+        result = self.doQuery("SELECT DISTINCT groupname FROM groups WHERE id IN (SELECT groupid FROM grouppquota WHERE printerid IN (SELECT printerid FROM printers WHERE printername=%s));" % self.doQuote(printername))
+        result = result.doParseResult(result)
+        if result is None :
+            return []
+        else :    
+            return [record["groupname"] for record in result]
+        
     def getUserId(self, username) :
         """Returns a userid given a username."""

pykota/trunk/pykota/tool.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.12  2003/02/06 23:20:02  jalet
+# warnpykota doesn't need any user/group name argument, mimicing the
+# warnquota disk quota tool.
+#
 # Revision 1.11  2003/02/06 22:54:33  jalet
 # warnpykota should be ok
@@ -94 +98 @@
         sys.exit(0)
         
-    def parseCommandline(self, argv, short, long) :
+    def parseCommandline(self, argv, short, long, allownothing=0) :
         """Parses the command line, controlling options."""
         # split options in two lists: those which need an argument, those which don't need any
@@ -146 +150 @@
                         # should never occur
                         raise PyKotaToolError, "Unexpected problem when parsing command line"
-            elif (not args) and sys.stdin.isatty() : # no option and no argument, we display help if we are a tty
+            elif (not args) and (not allownothing) and sys.stdin.isatty() : # no option and no argument, we display help if we are a tty
                 self.display_usage_and_quit()
         except getopt.error, msg :