src/hp/utils.py
changeset 65 6289931858a7
parent 45 316a0101512e
child 83 07c9aa7de765
--- a/src/hp/utils.py	Fri Nov 16 17:38:24 2012 +0100
+++ b/src/hp/utils.py	Fri Nov 16 18:33:51 2012 +0100
@@ -24,13 +24,15 @@
     
 
 def get_all_objects(res_url, field_filter):
-    contents = []
+    objects = []
     url = res_url
     while url:        
         r = requests.get(url)
         if r.status_code != requests.codes.ok: #@UndefinedVariable
-            logger.error("Error when requesting contents " + repr(r.status_code) + " : " + repr(r.text))
+            logger.error("Error when requesting objects " + repr(r.status_code) + " : " + repr(r.text))
             break
-        contents.extend([ c for c in  r.json['objects'] if c.get(field_filter, None) ])
+        objects.extend([ c for c in  r.json['objects'] if field_filter is None or c.get(field_filter, None) ])
         url = get_abs_url(r.json.get('meta',{}).get('next',None), settings.LDT_NETLOC)
-    return contents
+    return objects
+
+