From dcd959f3dc251e0d4f3ab02bf917386201414c40 Mon Sep 17 00:00:00 2001 From: miker Date: Sun, 2 Dec 2007 02:54:41 +0000 Subject: [PATCH] moving op_join to the right place ... duh git-svn-id: svn://svn.open-ils.org/ILS/trunk@8125 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/c-apps/oils_cstore.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Open-ILS/src/c-apps/oils_cstore.c b/Open-ILS/src/c-apps/oils_cstore.c index b8ed3d7bd9..11d2c91e1d 100644 --- a/Open-ILS/src/c-apps/oils_cstore.c +++ b/Open-ILS/src/c-apps/oils_cstore.c @@ -1550,20 +1550,20 @@ static char* searchWHERE ( const jsonObject* search_hash, osrfHash* meta, int op int first = 1; if ( search_hash->type == JSON_ARRAY ) { - if (first) { - first = 0; - } else { - if (opjoin_type == OR_OP_JOIN) buffer_add(sql_buf, " OR "); - else buffer_add(sql_buf, " AND "); - } + jsonObjectIterator* search_itr = jsonNewObjectIterator( search_hash ); + while ( (node = jsonObjectIteratorNext( search_itr )) ) { + if (first) { + first = 0; + } else { + if (opjoin_type == OR_OP_JOIN) buffer_add(sql_buf, " OR "); + else buffer_add(sql_buf, " AND "); + } - jsonObjectIterator* search_itr = jsonNewObjectIterator( search_hash ); - while ( (node = jsonObjectIteratorNext( search_itr )) ) { - char* subpred = searchWHERE( node->item, meta, opjoin_type ); - buffer_fadd(sql_buf, "( %s )", subpred); - free(subpred); + char* subpred = searchWHERE( node->item, meta, opjoin_type ); + buffer_fadd(sql_buf, "( %s )", subpred); + free(subpred); } - jsonObjectIteratorFree(search_itr); + jsonObjectIteratorFree(search_itr); } else if ( search_hash->type == JSON_HASH ) { jsonObjectIterator* search_itr = jsonNewObjectIterator( search_hash ); -- 2.11.0