Changeset 1990 for pykota/trunk/pykota

Show
Ignore:
Timestamp:
12/21/04 15:45:31 (19 years ago)
Author:
jalet
Message:

Prepared dumpykota to accept the new --filter command line option. Some
additionnal work needs to be done in the backends though.

Location:
pykota/trunk/pykota/storages
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • pykota/trunk/pykota/storages/ldapstorage.py

    r1969 r1990  
    2222# 
    2323# $Log$ 
     24# Revision 1.90  2004/12/21 14:45:31  jalet 
     25# Prepared dumpykota to accept the new --filter command line option. Some 
     26# additionnal work needs to be done in the backends though. 
     27# 
    2428# Revision 1.89  2004/12/02 22:27:11  jalet 
    2529# Integrated and extended Stefan Wold's patch to store print quota entries 
    … …  
    13961400        self.doDelete(printer.ident)     
    13971401         
    1398     def extractPrinters(self) : 
     1402    def extractPrinters(self, extractonly={}) : 
    13991403        """Extracts all printer records.""" 
    14001404        entries = [p for p in [self.getPrinter(name) for name in self.getAllPrintersNames()] if p.Exists] 
    … …  
    14051409            return result  
    14061410         
    1407     def extractUsers(self) : 
     1411    def extractUsers(self, extractonly={}) : 
    14081412        """Extracts all user records.""" 
    14091413        entries = [u for u in [self.getUser(name) for name in self.getAllUsersNames()] if u.Exists] 
    … …  
    14141418            return result  
    14151419         
    1416     def extractGroups(self) : 
     1420    def extractGroups(self, extractonly={}) : 
    14171421        """Extracts all group records.""" 
    14181422        entries = [g for g in [self.getGroup(name) for name in self.getAllGroupsNames()] if g.Exists] 
    … …  
    14231427            return result  
    14241428         
    1425     def extractPayments(self) : 
     1429    def extractPayments(self, extractonly={}) : 
    14261430        """Extracts all payment records.""" 
    14271431        entries = [u for u in [self.getUser(name) for name in self.getAllUsersNames()] if u.Exists] 
    … …  
    14331437            return result         
    14341438         
    1435     def extractUpquotas(self) : 
     1439    def extractUpquotas(self, extractonly={}) : 
    14361440        """Extracts all userpquota records.""" 
    14371441        entries = [p for p in [self.getPrinter(name) for name in self.getAllPrintersNames()] if p.Exists] 
    … …  
    14431447            return result 
    14441448         
    1445     def extractGpquotas(self) : 
     1449    def extractGpquotas(self, extractonly={}) : 
    14461450        """Extracts all grouppquota records.""" 
    14471451        entries = [p for p in [self.getPrinter(name) for name in self.getAllPrintersNames()] if p.Exists] 
    … …  
    14531457            return result 
    14541458         
    1455     def extractUmembers(self) : 
     1459    def extractUmembers(self, extractonly={}) : 
    14561460        """Extracts all user groups members.""" 
    14571461        entries = [g for g in [self.getGroup(name) for name in self.getAllGroupsNames()] if g.Exists] 
    … …  
    14631467            return result         
    14641468                 
    1465     def extractPmembers(self) : 
     1469    def extractPmembers(self, extractonly={}) : 
    14661470        """Extracts all printer groups members.""" 
    14671471        entries = [p for p in [self.getPrinter(name) for name in self.getAllPrintersNames()] if p.Exists] 
    … …  
    14731477            return result         
    14741478         
    1475     def extractHistory(self) : 
     1479    def extractHistory(self, extractonly={}) : 
    14761480        """Extracts all jobhistory records.""" 
    14771481        entries = self.retrieveHistory(limit=None) 

  • pykota/trunk/pykota/storages/sql.py

    r1875 r1990  
    2222# 
    2323# $Log$ 
     24# Revision 1.60  2004/12/21 14:45:31  jalet 
     25# Prepared dumpykota to accept the new --filter command line option. Some 
     26# additionnal work needs to be done in the backends though. 
     27# 
    2428# Revision 1.59  2004/10/25 14:12:25  jalet 
    2529# For URGENT legal reasons (Italy), a new "privacy" directive was added to pykota.conf 
    … …  
    132136            return entries 
    133137         
    134     def extractPrinters(self) : 
     138    def extractPrinters(self, extractonly={}) : 
    135139        """Extracts all printer records.""" 
    136140        result = self.doRawSearch("SELECT * FROM printers ORDER BY id ASC") 
    137141        return self.prepareRawResult(result) 
    138142         
    139     def extractUsers(self) : 
     143    def extractUsers(self, extractonly={}) : 
    140144        """Extracts all user records.""" 
    141145        result = self.doRawSearch("SELECT * FROM users ORDER BY id ASC") 
    142146        return self.prepareRawResult(result) 
    143147         
    144     def extractGroups(self) : 
     148    def extractGroups(self, extractonly={}) : 
    145149        """Extracts all group records.""" 
    146150        result = self.doRawSearch("SELECT groups.*,COALESCE(SUM(balance), 0) AS balance, COALESCE(SUM(lifetimepaid), 0) as lifetimepaid FROM groups LEFT OUTER JOIN users ON users.id IN (SELECT userid FROM groupsmembers WHERE groupid=groups.id) GROUP BY groups.id,groups.groupname,groups.limitby ORDER BY groups.id ASC") 
    147151        return self.prepareRawResult(result) 
    148152         
    149     def extractPayments(self) : 
     153    def extractPayments(self, extractonly={}) : 
    150154        """Extracts all payment records.""" 
    151155        result = self.doRawSearch("SELECT username,payments.* FROM users,payments WHERE users.id=payments.userid ORDER BY payments.id ASC") 
    152156        return self.prepareRawResult(result) 
    153157         
    154     def extractUpquotas(self) : 
     158    def extractUpquotas(self, extractonly={}) : 
    155159        """Extracts all userpquota records.""" 
    156160        result = self.doRawSearch("SELECT users.username,printers.printername,userpquota.* FROM users,printers,userpquota WHERE users.id=userpquota.userid AND printers.id=userpquota.printerid ORDER BY userpquota.id ASC") 
    157161        return self.prepareRawResult(result) 
    158162         
    159     def extractGpquotas(self) : 
     163    def extractGpquotas(self, extractonly={}) : 
    160164        """Extracts all grouppquota records.""" 
    161165        result = self.doRawSearch("SELECT groups.groupname,printers.printername,grouppquota.*,coalesce(sum(pagecounter), 0) AS pagecounter,coalesce(sum(lifepagecounter), 0) AS lifepagecounter FROM groups,printers,grouppquota,userpquota WHERE groups.id=grouppquota.groupid AND printers.id=grouppquota.printerid AND userpquota.printerid=grouppquota.printerid AND userpquota.userid IN (SELECT userid FROM groupsmembers WHERE groupsmembers.groupid=grouppquota.groupid) GROUP BY grouppquota.id,grouppquota.groupid,grouppquota.printerid,grouppquota.softlimit,grouppquota.hardlimit,grouppquota.datelimit,groups.groupname,printers.printername ORDER BY grouppquota.id") 
    162166        return self.prepareRawResult(result) 
    163167         
    164     def extractUmembers(self) : 
     168    def extractUmembers(self, extractonly={}) : 
    165169        """Extracts all user groups members.""" 
    166170        result = self.doRawSearch("SELECT groups.groupname, users.username, groupsmembers.* FROM groups,users,groupsmembers WHERE users.id=groupsmembers.userid AND groups.id=groupsmembers.groupid ORDER BY groupsmembers.groupid, groupsmembers.userid ASC") 
    167171        return self.prepareRawResult(result) 
    168172         
    169     def extractPmembers(self) : 
     173    def extractPmembers(self, extractonly={}) : 
    170174        """Extracts all printer groups members.""" 
    171175        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 ORDER BY printergroupsmembers.groupid, printergroupsmembers.printerid ASC") 
    172176        return self.prepareRawResult(result) 
    173177         
    174     def extractHistory(self) : 
     178    def extractHistory(self, extractonly={}) : 
    175179        """Extracts all jobhistory records.""" 
    176180        result = self.doRawSearch("SELECT users.username,printers.printername,jobhistory.* FROM users,printers,jobhistory WHERE users.id=jobhistory.userid AND printers.id=jobhistory.printerid ORDER BY jobhistory.id ASC")