From a10f6e27cfde5e7cf7fba28f00f73b8d5f52aeb0 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 2 Aug 2010 20:12:10 +0000 Subject: [PATCH] Some improvement over the last path --- UDLdap.py | 6 ++++++ ud-generate | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/UDLdap.py b/UDLdap.py index 447368d..3dc2b74 100644 --- a/UDLdap.py +++ b/UDLdap.py @@ -1,5 +1,6 @@ import ldap import time +import userdir_ldap class Account: array_values = ['keyFingerPrint'] @@ -62,6 +63,11 @@ class Account: def numkeys(self): return len(self['keyFingerPrint']) + def latitude_dec(self, anonymized=False): + return userdir_ldap.DecDegree(self['latitude'], anonymized) + def longitude_dec(self, anonymized=False): + return userdir_ldap.DecDegree(self['longitude'], anonymized) + def verbose_status(self): status = [] status.append('mail: %s' %(['disabled', 'active'][ self.has_mail() ])) diff --git a/ud-generate b/ud-generate index b31418a..303f9f5 100755 --- a/ud-generate +++ b/ud-generate @@ -585,7 +585,7 @@ def GenMarkers(File): if not ('latitude' in a and 'longitude' in a): continue try: - Line = "%8s %8s \"\""%(DecDegree(a['latitude'], 1), DecDegree(a['longitude'], 1)) + Line = "%8s %8s \"\""%(a.latitude_dec(True), a.longitude_dec(True)) Line = Sanitize(Line) + "\n" F.write(Line) except: -- 2.20.1