[open-ils-commits] [GIT] Evergreen ILS branch master updated. 96c404dd1ebaae5974669394c6a5e369f1d1ecb3

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  96c404dd1ebaae5974669394c6a5e369f1d1ecb3 (commit)
      from  4196ef8f61062f37b8b0b47657ea581bbfe6990d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 96c404dd1ebaae5974669394c6a5e369f1d1ecb3
Author: Mike Rylander <mrylander at gmail.com>
Date:   Wed Mar 21 12:14:44 2012 -0400

    Shooting 2 obvious thinkos d-e-d dead. Pardon the rogueness.
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/c-apps/oils_sql.c b/Open-ILS/src/c-apps/oils_sql.c
index 887a2df..24795b0 100644
--- a/Open-ILS/src/c-apps/oils_sql.c
+++ b/Open-ILS/src/c-apps/oils_sql.c
@@ -2981,7 +2981,7 @@ static char* searchPredicate( const ClassInfo* class_info, osrfHash* field,
 		buffer_fadd(
 			_p,
 			"\"%s\".%s IS NULL",
-			class_info->class_name,
+			class_info->alias,
 			osrfHashGet( field, "name" )
 		);
 		pred = buffer_release( _p );
@@ -5101,7 +5101,7 @@ static char* buildOrderByFromArray( osrfMethodContext* ctx, const jsonObject* or
 		const char* direction =
 			jsonObjectGetString( jsonObjectGetKeyConst( order_spec, "direction" ) );
 		if( direction ) {
-			if( direction[ 0 ] || 'D' == direction[ 0 ] )
+			if( direction[ 0 ] && ( 'd' == direction[ 0 ] || 'D' == direction[ 0 ] ) )
 				OSRF_BUFFER_ADD( order_buf, " DESC" );
 			else
 				OSRF_BUFFER_ADD( order_buf, " ASC" );

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/c-apps/oils_sql.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS