Changeset 1768 for pykota/trunk

Show
Ignore:
Timestamp:
10/04/04 13:27:57 (20 years ago)
Author:
jalet
Message:

Finished LDAP support for dumpykota.

Location:
pykota/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • pykota/trunk/NEWS

    r1766 r1768  
    2424    - 1.20alpha19 : 
    2525     
     26        - Finished implementation of LDAP support in dumpykota. 
     27         
    2628        - The md5 sum of the job's datas is now available as an  
    2729          hexadecimal digest in the PYKOTAMD5SUM environment variable. 
  • pykota/trunk/pykota/storages/ldapstorage.py

    r1765 r1768  
    2222# 
    2323# $Log$ 
     24# Revision 1.81  2004/10/04 11:27:57  jalet 
     25# Finished LDAP support for dumpykota. 
     26# 
    2427# Revision 1.80  2004/10/03 19:57:57  jalet 
    2528# Dump of payments should work with LDAP backend now. 
     
    13371340        entries = [p for p in [self.getPrinter(name) for name in self.getAllPrintersNames()] if p.Exists] 
    13381341        if entries : 
     1342            result = [ ("pykotaUserName", "pykotaPrinterName", "dn", "userdn", "printerdn", "pykotaLifePageCounter", "pykotaPageCounter", "pykotaSoftLimit", "pykotaHardLimit", "pykotaDateLimit") ] 
    13391343            for entry in entries : 
    1340                 userpquotas = [ upq for (u, upq) in self.getPrinterUsersAndQuotas(entry) ] 
    1341             pass     
     1344                for (user, userpquota) in self.getPrinterUsersAndQuotas(entry) : 
     1345                    result.append((user.Name, entry.Name, userpquota.ident, user.ident, entry.ident, userpquota.LifePageCounter, userpquota.PageCounter, userpquota.SoftLimit, userpquota.HardLimit, userpquota.DateLimit)) 
     1346            return result 
    13421347         
    13431348    def extractGpquotas(self) : 
     
    13451350        entries = [p for p in [self.getPrinter(name) for name in self.getAllPrintersNames()] if p.Exists] 
    13461351        if entries : 
     1352            result = [ ("pykotaGroupName", "pykotaPrinterName", "dn", "groupdn", "printerdn", "pykotaLifePageCounter", "pykotaPageCounter", "pykotaSoftLimit", "pykotaHardLimit", "pykotaDateLimit") ] 
    13471353            for entry in entries : 
    1348                 grouppquotas = [ gpq for (g, gpq) in self.getPrinterGroupsAndQuotas(entry) ] 
    1349             pass 
     1354                for (group, grouppquota) in self.getPrinterGroupsAndQuotas(entry) : 
     1355                    result.append((group.Name, entry.Name, grouppquota.ident, group.ident, entry.ident, grouppquota.LifePageCounter, grouppquota.PageCounter, grouppquota.SoftLimit, grouppquota.HardLimit, grouppquota.DateLimit)) 
     1356            return result 
    13501357         
    13511358    def extractUmembers(self) :