Fixed parsing fonction problem for slab-import.py.

diff --git a/sfa/senslab/parsing.py b/sfa/senslab/parsing.py
index 0234c24..21d9a06 100644 (file)
--- 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 4d07f10..621ed72 100644 (file)
--- 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):