[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. c0e3515dbbf5ac7941b183d6f0f063d1e2b992d0
Evergreen Git
git at git.evergreen-ils.org
Wed Mar 21 12:09:44 EDT 2012
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, rel_2_1 has been updated
via c0e3515dbbf5ac7941b183d6f0f063d1e2b992d0 (commit)
from b7eebefcf24ed9b4f85b1088410f1ec120a66163 (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 c0e3515dbbf5ac7941b183d6f0f063d1e2b992d0
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 3f8157d..d30f427 100644
--- a/Open-ILS/src/c-apps/oils_sql.c
+++ b/Open-ILS/src/c-apps/oils_sql.c
@@ -2918,7 +2918,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 );
@@ -5018,7 +5018,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
More information about the open-ils-commits
mailing list