Changeset 1330

Timestamp:

02/04/04 12:17:00 (21 years ago)

Author:

jalet

Message:

pkprinters command line tool added.

Location:

pykota/trunk

Files:

• bin/pkprinters (added)
• man/edpykota.1 (modified) (1 diff)
• man/genman.sh (modified) (1 diff)
• MANIFEST.in (modified) (1 diff)
• man/pkprinters.1 (added)
• man/pykotme.1 (modified) (1 diff)
• man/repykota.1 (modified) (1 diff)
• man/warnpykota.1 (modified) (1 diff)
• NEWS (modified) (1 diff)
• po/br/pykota.mo (modified) (previous)
• po/br/pykota.po (modified) (1 diff)
• po/en/pykota.po (modified) (1 diff)
• po/es/pykota.mo (modified) (previous)
• po/es/pykota.po (modified) (1 diff)
• po/fr/pykota.mo (modified) (previous)
• po/fr/pykota.po (modified) (1 diff)
• po/pt/pykota.mo (modified) (previous)
• po/pt/pykota.po (modified) (1 diff)
• po/pykota.pot (modified) (1 diff)
• po/se/pykota.mo (modified) (previous)
• po/se/pykota.po (modified) (1 diff)
• pykota/storage.py (modified) (2 diffs)
• pykota/storages/ldapstorage.py (modified) (2 diffs)
• pykota/storages/sql.py (modified) (2 diffs)
• pykota/version.py (modified) (1 diff)
• setup.py (modified) (2 diffs)

pykota/trunk/man/edpykota.1

@@ -1 +1 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH EDPYKOTA "1" "January 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
+.TH EDPYKOTA "1" "February 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NAME
-edpykota \- manual page for edpykota 1.17_unofficial
+edpykota \- manual page for edpykota 1.18alpha2_unofficial
 .SH DESCRIPTION
-edpykota v1.16beta1_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
+edpykota v1.18alpha2_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
 A Print Quota editor for PyKota.
 .PP

pykota/trunk/man/genman.sh

@@ -14 +14 @@
 # $Id$
 #
-for prog in edpykota pykotme repykota warnpykota ; do 
+for prog in edpykota pykotme repykota warnpykota pkprinters ; do 
     help2man --section=1 --manual "User Commands" --source="C@LL - Conseil Internet & Logiciels Libres" --output=$prog.1 --no-info $prog ; 
 done

pykota/trunk/MANIFEST.in

@@ -1 @@
-include README FAQ COPYING LICENSE TODO NEWS CREDITS SECURITY MANIFEST.in clean.sh bin/cupspykota bin/pykota bin/edpykota bin/warnpykota bin/repykota bin/pykotme bin/waitprinter.sh bin/papwaitprinter.sh bin/mailandpopup.sh bin/README
+include README FAQ COPYING LICENSE TODO NEWS CREDITS SECURITY MANIFEST.in clean.sh bin/cupspykota bin/pykota bin/edpykota bin/warnpykota bin/repykota bin/pykotme bin/pkprinters bin/waitprinter.sh bin/papwaitprinter.sh bin/mailandpopup.sh bin/README
 recursive-include po README *.po *.mo *.pot
 recursive-include man README *.sh *.1

pykota/trunk/man/pykotme.1

@@ -1 +1 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH PYKOTME "1" "January 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
+.TH PYKOTME "1" "February 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NAME
-pykotme \- manual page for pykotme 1.17_unofficial
+pykotme \- manual page for pykotme 1.18alpha2_unofficial
 .SH DESCRIPTION
-pykotme v1.16beta1_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
+pykotme v1.18alpha2_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
 .PP
 Gives print quotes to users.

pykota/trunk/man/repykota.1

@@ -1 +1 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH REPYKOTA "1" "January 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
+.TH REPYKOTA "1" "February 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NAME
-repykota \- manual page for repykota 1.17_unofficial
+repykota \- manual page for repykota 1.18alpha2_unofficial
 .SH DESCRIPTION
-repykota v1.16beta1_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
+repykota v1.18alpha2_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
 .PP
 Generates print quota reports.

pykota/trunk/man/warnpykota.1

@@ -1 +1 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH WARNPYKOTA "1" "January 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
+.TH WARNPYKOTA "1" "February 2004" "C@LL - Conseil Internet & Logiciels Libres" "User Commands"
 .SH NAME
-warnpykota \- manual page for warnpykota 1.17_unofficial
+warnpykota \- manual page for warnpykota 1.18alpha2_unofficial
 .SH DESCRIPTION
-warnpykota v1.16beta1_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
+warnpykota v1.18alpha2_unofficial (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
 .PP
 Sends mail to users over print quota.

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.18alpha2 :
+    
+        - Added the pkprinters command line tool to manage printers
+          exclusively.
+        
     - 1.18alpha1 :
     

pykota/trunk/po/br/pykota.po

@@ -84 +84 @@
 msgstr "Voce deve informar usuario ou grupo na linha de comando"
 
+msgid "You have to pass printer names on the command line"
+msgstr "Voce deve informar impressora na linha de comando"
+
 #, python-format
 msgid "Prototype %s not found in Quota Storage for printer %s."

pykota/trunk/po/en/pykota.po

@@ -88 +88 @@
 msgstr ""
 
+msgid "You have to pass printer names on the command line"
+msgstr ""
+
 #, python-format
 msgid "Prototype %s not found in Quota Storage for printer %s."

pykota/trunk/po/es/pykota.po

@@ -86 +86 @@
 "Usted tiene que pasar nombres de usuarios o grupos en la l�a de comandos"
 
+msgid "You have to pass printer names on the command line"
+msgstr "Usted tiene que pasar nombres de impresoras en la l�a de comandos"
+
 #, python-format
 msgid "Prototype %s not found in Quota Storage for printer %s."

pykota/trunk/po/fr/pykota.po

@@ -91 +91 @@
 "commande"
 
+msgid "You have to pass printer names on the command line"
+msgstr "Vous devez passer des noms d'imprimantes sur la ligne de commande"
+
 #, python-format
 msgid "Prototype %s not found in Quota Storage for printer %s."

pykota/trunk/po/pt/pykota.po

@@ -84 +84 @@
 msgstr "�Obrigat� a utiliza� de nomes de utilizador ou grupo na linha de comando"
 
+msgid "You have to pass printer names on the command line"
+msgstr "�Obrigat� a utiliza� de nomes de impressora na linha de comando"
+
 #, python-format
 msgid "Prototype %s not found in Quota Storage for printer %s."

pykota/trunk/po/pykota.pot

@@ -88 +88 @@
 msgstr ""
 
+msgid "You have to pass printer names on the command line"
+msgstr ""
+
 #, python-format
 msgid "Prototype %s not found in Quota Storage for printer %s."

pykota/trunk/po/se/pykota.po

@@ -88 +88 @@
 msgstr "Du m�e skicka med anv�are- eller gruppnamn p�ommandoraden"
 
+msgid "You have to pass printer names on the command line"
+msgstr "Du m�e skicka med skrivarnamn p�ommandoraden"
+
 #, python-format
 msgid "Prototype %s not found in Quota Storage for printer %s."

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.39  2004/02/04 11:16:59  jalet
+# pkprinters command line tool added.
+#
 # Revision 1.38  2004/01/12 22:43:40  jalet
 # New formula to compute a job's price
@@ -272 +275 @@
             self.PricePerJob = float(priceperjob)
         self.parent.writePrinterPrices(self)
+        
+    def delete(self) :    
+        """Deletes a printer from the Quota Storage."""
+        self.parent.beginTransaction()
+        try :
+            self.parent.deletePrinter(self)
+        except PyKotaStorageError, msg :    
+            self.parent.rollbackTransaction()
+            raise PyKotaStorageError, msg
+        else :    
+            self.parent.commitTransaction()
         
 class StorageUserPQuota(StorageObject) :

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.50  2004/02/04 11:17:00  jalet
+# pkprinters command line tool added.
+#
 # Revision 1.49  2004/01/29 22:35:45  jalet
 # Small fix from Matt.
@@ -974 +977 @@
             else :    
                 self.doDelete(group.ident)
-            
+                
+    def deletePrinter(self, printer) :    
+        """Completely deletes an user from the Quota Storage."""
+        result = self.doSearch("(&(objectClass=pykotaLastJob)(pykotaPrinterName=%s))" % printer.Name, base=self.info["lastjobbase"])
+        for (ident, fields) in result :
+            self.doDelete(ident)
+        result = self.doSearch("(&(objectClass=pykotaJob)(pykotaPrinterName=%s))" % printer.Name, base=self.info["jobbase"])
+        for (ident, fields) in result :
+            self.doDelete(ident)
+        result = self.doSearch("(&(objectClass=pykotaGroupPQuota)(pykotaPrinterName=%s))" % printer.Name, base=self.info["groupquotabase"])
+        for (ident, fields) in result :
+            self.doDelete(ident)
+        result = self.doSearch("(&(objectClass=pykotaUserPQuota)(pykotaPrinterName=%s))" % printer.Name, base=self.info["userquotabase"])
+        for (ident, fields) in result :
+            self.doDelete(ident)
+        for parent in self.getParentPrinters(printer) :  
+            parent.uniqueMember.remove(printer.ident)
+            fields = {
+                       "uniqueMember" : parent.uniqueMember,
+                     }  
+            self.doModify(parent.ident, fields)         
+        self.doDelete(printer.ident)    

pykota/trunk/pykota/storages/sql.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.35  2004/02/04 11:17:00  jalet
+# pkprinters command line tool added.
+#
 # Revision 1.34  2004/02/02 22:44:16  jalet
 # Preliminary work on Relationnal Database Independance via DB-API 2.0
@@ -408 +411 @@
                  ] :  
             self.doModify(q)
-        
+            
+    def deletePrinter(self, printer) :    
+        """Completely deletes a printer from the Quota Storage."""
+        for q in [ 
+                    "DELETE FROM printergroupsmembers WHERE groupid=%s OR printerid=%s" % (self.doQuote(printer.ident), self.doQuote(printer.ident)),
+                    "DELETE FROM jobhistory WHERE printerid=%s" % self.doQuote(printer.ident),
+                    "DELETE FROM grouppquota WHERE printerid=%s" % self.doQuote(printer.ident),
+                    "DELETE FROM userpquota WHERE printerid=%s" % self.doQuote(printer.ident),
+                    "DELETE FROM printers WHERE id=%s" % self.doQuote(printer.ident),
+                  ] :
+            self.doModify(q)
+        

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.18alpha1_unofficial"
+__version__ = "1.18alpha2_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""

pykota/trunk/setup.py

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.33  2004/02/04 11:16:59  jalet
+# pkprinters command line tool added.
+#
 # Revision 1.32  2004/01/18 20:52:50  jalet
 # Portuguese portuguese translation replaces brasilian portuguese one, which
@@ -380 +383 @@
       url = "http://www.librelogiciel.com/software/",
       packages = [ "pykota", "pykota.storages", "pykota.requesters", "pykota.loggers", "pykota.accounters", "pykota.reporters" ],
-      scripts = [ "bin/cupspykota", "bin/pykota", "bin/edpykota", "bin/repykota", "bin/warnpykota", "bin/pykotme", "bin/waitprinter.sh", "bin/papwaitprinter.sh", "bin/mailandpopup.sh", "contributed/pagecount.pl" ],
+      scripts = [ "bin/cupspykota", "bin/pykota", "bin/edpykota", "bin/repykota", "bin/warnpykota", "bin/pykotme", "bin/pkprinters", "bin/waitprinter.sh", "bin/papwaitprinter.sh", "bin/mailandpopup.sh", "contributed/pagecount.pl" ],
       data_files = data_files)