[open-ils-commits] r8179 - trunk/Open-ILS/src/c-apps

[svn at svn.open-ils.org]

Author: miker
Date: 2007-12-08 23:44:45 -0500 (Sat, 08 Dec 2007)
New Revision: 8179

Modified:
   trunk/Open-ILS/src/c-apps/oils_cstore.c
Log:
slowly adding back the iterator cleanup

Modified: trunk/Open-ILS/src/c-apps/oils_cstore.c
===================================================================
--- trunk/Open-ILS/src/c-apps/oils_cstore.c	2007-12-09 04:12:31 UTC (rev 8178)
+++ trunk/Open-ILS/src/c-apps/oils_cstore.c	2007-12-09 04:44:45 UTC (rev 8179)
@@ -1322,7 +1322,7 @@
 
 			break;
 		}
-        // jsonObjectIteratorFree(pred_itr);
+        jsonObjectIteratorFree(pred_itr);
 	} else if (node->type == JSON_NULL) { // IS NULL search
 		growing_buffer* _p = buffer_init(64);
 		buffer_fadd(
@@ -1532,7 +1532,7 @@
 		free(field);
 	}
 
-    // jsonObjectIteratorFree(search_itr);
+    jsonObjectIteratorFree(search_itr);
 
 	return buffer_release(join_buf);
 }
@@ -2234,10 +2234,10 @@
             }
 		}
 
-        // jsonObjectIteratorFree(select_itr);
+        jsonObjectIteratorFree(select_itr);
 	}
 
-    // jsonObjectIteratorFree(class_itr);
+    jsonObjectIteratorFree(class_itr);
 
 	char* col_list = buffer_release(select_buf);
 	char* table = getSourceDefinition(meta);
@@ -2347,7 +2347,7 @@
 
 					}
 
-                    // jsonObjectIteratorFree(order_itr);
+                    jsonObjectIteratorFree(order_itr);
 
 				} else {
 					string = jsonObjectToSimpleString(snode->item);
@@ -2358,7 +2358,7 @@
 
 			}
 
-            // jsonObjectIteratorFree(class_itr);
+            jsonObjectIteratorFree(class_itr);
 
 			string = buffer_release(order_buf);
 
@@ -2576,7 +2576,7 @@
 						while ((_f = jsonObjectIteratorNext( _i ))) {
 							osrfStringArrayAdd( link_fields, jsonObjectToSimpleString( _f->item ) );
 						}
-                        // jsonObjectIteratorFree(_i);
+                        jsonObjectIteratorFree(_i);
 					}
 				}
 
@@ -3048,7 +3048,7 @@
 static jsonObject* oilsMakeFieldmapperFromResult( dbi_result result, osrfHash* meta) {
 	if(!(result && meta)) return jsonNULL;
 
-	jsonObject* object = jsonParseString("[]");
+	jsonObject* object = jsonNewObject(NULL);
 	jsonObjectSetClass(object, osrfHashGet(meta, "classname"));
 
 	osrfHash* fields = osrfHashGet(meta, "fields");
@@ -3158,7 +3158,7 @@
 static jsonObject* oilsMakeJSONFromResult( dbi_result result ) {
 	if(!result) return jsonNULL;
 
-	jsonObject* object = jsonParseString("{}");
+	jsonObject* object = jsonNewObject(NULL);
 
 	time_t _tmp_dt;
 	char dt_string[256];