Tidy up parsing and JSONifying data for API '/shelters' response

src/web/views/shelterapiv02.py

@@ -164,6 +164,7 @@ def allshelters(shelter_id=None):
     		.join(Category, Category.id == ShelterPicture.category_id)		
     
     catquery = db.session.query(Category.name).filter(Category.section_id != None)
+    
     ##queries if no request arguments
     shelter_properties = querybase
     shelter_pictures = picquerybase
@@ -204,8 +205,8 @@ def allshelters(shelter_id=None):
 
     #print(shelter_properties)
     #print(shelter_pictures)
-    print(catquery)
-    if request.args.get('format') == 'prettytext':
+    
+    
     for shelter_property in shelter_properties:
     	if not result[shelter_property.shelter_id]:
     		for category in catquery:
@@ -213,18 +214,13 @@ def allshelters(shelter_id=None):
     				result[shelter_property.shelter_id][category.name]["Cover"]
     			result[shelter_property.shelter_id][category.name]["Attributes"]
     			result[shelter_property.shelter_id][category.name]["Pictures"]
-    		result[shelter_property.shelter_id][shelter_property.supercategory_name]["Attributes"][shelter_property.name] = shelter_property.value
     	
+    	if request.args.get('format') == 'prettytext':
+    		result[shelter_property.shelter_id][shelter_property.supercategory_name]["Attributes"][shelter_property.name] = shelter_property.value
     	else:
-    	for shelter_property in shelter_properties:
-    		if not result[shelter_property.shelter_id]:
-    			for category in catquery:
-    				if category.name == "Identification":
-    					result[shelter_property.shelter_id][category.name]["Cover"]
-    				result[shelter_property.shelter_id][category.name]["Attributes"]
-    				result[shelter_property.shelter_id][category.name]["Pictures"]
     		result[shelter_property.shelter_id][shelter_property.supercategory_name]["Attributes"][shelter_property.uniqueid] = shelter_property.value
     
+    
     for picture in shelter_pictures:
     	if picture.is_main_picture == True:
     		result[picture.shelter_id]["Identification"]["Cover"] = ["{}/{}/{}".format(picpath, picture.shelter_id, picture.filename)]