Fixed parsing fonction problem for slab-import.py.

[sfa.git] / sfa / senslab / parsing.py

diff --git a/sfa/senslab/parsing.py b/sfa/senslab/parsing.py
index 248caad..21d9a06 100644 (file)
--- a/sfa/senslab/parsing.py
+++ b/sfa/senslab/parsing.py
@@ -34,22 +34,25 @@ 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:
                tmp_item = {}
                
                if type(param_filter) is list :
-                       print>>sys.stderr, " \r\n p_filter LIST %s " %(param_filter)
+                       #print>>sys.stderr, " \r\n p_filter LIST %s " %(param_filter)
                        
                        for p_filter in param_filter:
-                               print>>sys.stderr, " \r\n p_filter %s \t item %s " %(p_filter,item)
+                               #print>>sys.stderr, " \r\n p_filter %s \t item %s " %(p_filter,item)
                                if type(p_filter) is int:
                                        if item[list_type[type_of_list]['int']] == p_filter :
                                                if return_fields:
@@ -82,7 +85,7 @@ def parse_filter(list_to_filter, param_filter, type_of_list, return_fields=None)
                                        del tmp_copy[key] 
                                        
                        
-                       print>>sys.stderr, " \r\n tmp_copy %s param_filter %s cmp = %s " %(tmp_copy, param_filter,cmp(tmp_copy, stripped_filterdict))
+                       #print>>sys.stderr, " \r\n tmp_copy %s param_filter %s cmp = %s " %(tmp_copy, param_filter,cmp(tmp_copy, stripped_filterdict))
                        
                        if cmp(tmp_copy, stripped_filterdict) == 0:     
                                if return_fields: