Changeset 2699

Timestamp:

02/15/06 23:42:47 (18 years ago)

Author:

jerome

Message:

Preliminary work on pkusers. Don't use it right now !

Location:

pykota/trunk

Files:

• bin/pkusers (added)
• MANIFEST.in (modified) (1 diff)
• pykota/storage.py (modified) (3 diffs)
• setup.py (modified) (1 diff)

pykota/trunk/MANIFEST.in

@@ -2 +2 @@
 include clean.sh checkdeps.py bin/pykoef bin/pkturnkey bin/pkmail bin/pkbanner
 include bin/autopykota bin/dumpykota bin/cupspykota bin/edpykota bin/warnpykota
-include bin/repykota bin/pykotme bin/pykosd bin/pkprinters bin/pkbcodes bin/pkinvoice
+include bin/repykota bin/pykotme bin/pykosd bin/pkprinters bin/pkbcodes bin/pkinvoice bin/pkusers
 include bin/waitprinter.sh bin/papwaitprinter.sh bin/mailandpopup.sh bin/README
 recursive-include po README *.sh *.po *.mo *.pot

pykota/trunk/pykota/storage.py

@@ -49 +49 @@
             self.Description = str(description)
             self.isDirty = True    
+            
+    def save(self) :        
+        """Saves the object to the database."""
+        if self.isDirty :
+            getattr(self.parent, "save%s" % self.__class__.__name__[7:])(self)
+            self.isDirty = False
         
 class StorageUser(StorageObject) :        
@@ -169 +175 @@
         else :
             raise AttributeError, name
-            
-    def save(self) :    
-        """Saves the billing code to disk in a single operation."""
-        if self.isDirty :
-            self.parent.savePrinter(self)
-            self.isDirty = False
             
     def addJobToHistory(self, jobid, user, pagecounter, action, jobsize=None, jobprice=None, filename=None, title=None, copies=None, options=None, clienthost=None, jobsizebytes=None, jobmd5sum=None, jobpages=None, jobbilling=None, precomputedsize=None, precomputedprice=None) :
@@ -475 +475 @@
         self.PageCounter = pagecounter
         self.isDirty = True
-        
-    def save(self) :    
-        """Saves the billing code to disk in a single operation."""
-        if self.isDirty :
-            self.parent.saveBillingCode(self)
-            self.isDirty = False
         
     def consume(self, pages, price) :

pykota/trunk/setup.py

@@ -117 +117 @@
       url = "http://www.librelogiciel.com/software/",
       packages = [ "pykota", "pykota.storages", "pykota.loggers", "pykota.accounters", "pykota.reporters" ],
-      scripts = [ "bin/pkinvoice", "bin/pykoef", "bin/pkturnkey", "bin/pkbcodes", "bin/pkmail", "bin/pkbanner", "bin/autopykota", "bin/dumpykota", "bin/pykosd", "bin/edpykota", "bin/repykota", "bin/warnpykota", "bin/pykotme", "bin/pkprinters" ],
+      scripts = [ "bin/pkusers", "bin/pkinvoice", "bin/pykoef", \
+                  "bin/pkturnkey", "bin/pkbcodes", "bin/pkmail", \
+                  "bin/pkbanner", "bin/autopykota", "bin/dumpykota", \
+                  "bin/pykosd", "bin/edpykota", "bin/repykota", \
+                  "bin/warnpykota", "bin/pykotme", "bin/pkprinters" ],
       data_files = data_files)