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

[svn at svn.open-ils.org]

Author: miker
Date: 2008-12-15 11:17:45 -0500 (Mon, 15 Dec 2008)
New Revision: 11577

Modified:
   trunk/Open-ILS/src/c-apps/oils_cstore.c
Log:
WHERE clause debugging

Modified: trunk/Open-ILS/src/c-apps/oils_cstore.c
===================================================================
--- trunk/Open-ILS/src/c-apps/oils_cstore.c	2008-12-15 16:17:16 UTC (rev 11576)
+++ trunk/Open-ILS/src/c-apps/oils_cstore.c	2008-12-15 16:17:45 UTC (rev 11577)
@@ -674,6 +674,8 @@
 #endif
 
         obj = doFieldmapperSearch(ctx, class_obj, _p, &err);
+
+        jsonObjectFree(_p);
         if(err) return err;
 
         jsonObject* cur;
@@ -715,6 +717,7 @@
         free(_s);
 
         obj = doFieldmapperSearch(ctx, class_obj, _p, &err);
+
         jsonObjectFree(_p);
         if(err) return err;
 
@@ -2039,6 +2042,7 @@
 
     int first = 1;
     if ( search_hash->type == JSON_ARRAY ) {
+	    osrfLogDebug(OSRF_LOG_MARK, "%s: In WHERE clause, condition type is JSON_ARRAY", MODULENAME);
         jsonIterator* search_itr = jsonNewIterator( search_hash );
         while ( (node = jsonIteratorNext( search_itr )) ) {
             if (first) {
@@ -2055,6 +2059,7 @@
         jsonIteratorFree(search_itr);
 
     } else if ( search_hash->type == JSON_HASH ) {
+	    osrfLogDebug(OSRF_LOG_MARK, "%s: In WHERE clause, condition type is JSON_HASH", MODULENAME);
         jsonIterator* search_itr = jsonNewIterator( search_hash );
         while ( (node = jsonIteratorNext( search_itr )) ) {
 
@@ -3057,6 +3062,7 @@
 
 	char* sql = buildSELECT( search_hash, order_hash, meta, ctx );
 	if (!sql) {
+		osrfLogDebug(OSRF_LOG_MARK, "Problem building query, returning NULL");
 		*err = -1;
 		return NULL;
 	}