From: Sandrine Avakian Date: Tue, 15 Nov 2011 14:19:20 +0000 (+0100) Subject: Fixed parsing fonction problem for slab-import.py. X-Git-Tag: sfa-2.1-24~3^2~294 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3d03c4fc715d590f059a56966a13943803c8c079;p=sfa.git Fixed parsing fonction problem for slab-import.py. --- diff --git a/sfa/senslab/parsing.py b/sfa/senslab/parsing.py index 0234c247..21d9a06f 100644 --- a/sfa/senslab/parsing.py +++ b/sfa/senslab/parsing.py @@ -34,12 +34,15 @@ def parse_filter(list_to_filter, param_filter, type_of_list, return_fields=None) 'site':{'str':'login_base','int':'site_id'},\ 'node':{'str':'hostname','int':'node_id'},\ 'slice':{'str':'name','int':'slice_id'}} - + + print>>sys.stderr, " \r\n ___ parse_filter param_filter %s type %s return fields %s " %(param_filter,type_of_list, return_fields) + if param_filter is None and return_fields is None: + return list_to_filter + if type_of_list not in list_type: print>>sys.stderr, " \r\n type_of_list Error parse_filter %s " %(type_of_list) return [] - - #print>>sys.stderr, " \r\n ____FIRST ENTRY parse_filter param_filter %s type %s list %s " %(param_filter, type(param_filter), list_to_filter) + return_filtered_list= [] for item in list_to_filter: diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py index 4d07f10f..621ed721 100644 --- a/sfa/senslab/slabdriver.py +++ b/sfa/senslab/slabdriver.py @@ -56,9 +56,7 @@ class SlabDriver (): def GetPersons(self, person_filter=None, return_fields=None): person_list = self.ldap.ldapFind({'authority': self.root_auth }) - print>>sys.stderr, " \r\n \t\t SLABDRIVER.PY : GetPersons ldapfind rslt \r\n \t %s "%(person_list) return_person_list = parse_filter(person_list,person_filter ,'persons', return_fields) - print>>sys.stderr, " \r\n \t\t SLABDRIVER.PY : GetPersons parse_filter \r\n \t %s "%(return_person_list) return return_person_list def GetNodes(self,node_filter= None, return_fields=None):