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

[svn at svn.open-ils.org]

Author: miker
Date: 2008-11-13 17:07:51 -0500 (Thu, 13 Nov 2008)
New Revision: 11175

Modified:
   trunk/Open-ILS/src/c-apps/oils_cstore.c
Log:
clearer logic, because I obviously got it wrong ... berick++

Modified: trunk/Open-ILS/src/c-apps/oils_cstore.c
===================================================================
--- trunk/Open-ILS/src/c-apps/oils_cstore.c	2008-11-13 21:21:29 UTC (rev 11174)
+++ trunk/Open-ILS/src/c-apps/oils_cstore.c	2008-11-13 22:07:51 UTC (rev 11175)
@@ -1953,9 +1953,10 @@
 
 			    if (is_agg->size || (flags & SELECT_DISTINCT)) {
 
-				    if (
-                        !jsonBoolIsTrue( jsonObjectGetKey( selfield, "aggregate" ) ) ||
-	                    !(((int)jsonObjectGetNumber(jsonObjectGetKey( selfield, "aggregate" ))) == 1) // support 1/0 for perl's sake
+				    if ( !(
+                            jsonBoolIsTrue( jsonObjectGetKey( selfield, "aggregate" ) ) ||
+	                        ((int)jsonObjectGetNumber(jsonObjectGetKey( selfield, "aggregate" ))) == 1 // support 1/0 for perl's sake
+                         )
                     ) {
 					    if (gfirst) {
 						    gfirst = 0;
@@ -2324,9 +2325,10 @@
 
             if (locale) {
         		char* i18n = osrfHashGet(field, "i18n");
-			    if (
-                    !jsonBoolIsTrue( jsonObjectGetKey( order_hash, "no_i18n" ) ) ||
-                    !(((int)jsonObjectGetNumber(jsonObjectGetKey( order_hash, "no_i18n" ))) == 1) // support 1/0 for perl's sake
+			    if ( !(
+                        jsonBoolIsTrue( jsonObjectGetKey( order_hash, "no_i18n" ) ) ||
+                        ((int)jsonObjectGetNumber(jsonObjectGetKey( order_hash, "no_i18n" ))) == 1 // support 1/0 for perl's sake
+                     )
                 ) i18n = NULL;
 
     			if ( i18n && !strncasecmp("true", i18n, 4)) {