[open-ils-commits] r8083 - trunk/Open-ILS/src/apachemods

[svn at svn.open-ils.org]

Author: miker
Date: 2007-11-18 22:31:43 -0500 (Sun, 18 Nov 2007)
New Revision: 8083

Modified:
   trunk/Open-ILS/src/apachemods/mod_rest_gateway.c
Log:
Patch from Scott McKellar to implement const-correctness and move to the newStyleNames instead of the old_style_names

Modified: trunk/Open-ILS/src/apachemods/mod_rest_gateway.c
===================================================================
--- trunk/Open-ILS/src/apachemods/mod_rest_gateway.c	2007-11-19 03:23:44 UTC (rev 8082)
+++ trunk/Open-ILS/src/apachemods/mod_rest_gateway.c	2007-11-19 03:31:43 UTC (rev 8083)
@@ -69,7 +69,7 @@
         jsonObjectSetKey(response, "payload", payload );
 
 	/* verify we are connected */
-	if(!osrf_system_get_transport_client()) {
+		if(!osrfSystemGetTransportClient()) {
 		osrfLogError( OSRF_LOG_MARK, "Bootstrap Failed, no transport client");
 		return HTTP_INTERNAL_SERVER_ERROR;
 	}
@@ -150,12 +150,12 @@
 
 	osrfLogDebug( OSRF_LOG_MARK, "MOD session service: %s", session->remote_service );
 
-	int req_id = osrf_app_session_make_req( session, NULL, method, 1, sarray );
+	int req_id = osrfAppSessionMakeRequest( session, NULL, method, 1, sarray );
 	string_array_destroy(sarray);
 
 	osrf_message* omsg = NULL;
 
-        while((omsg = osrf_app_session_request_recv( session, req_id, 60 ))) {
+	while((omsg = osrfAppSessionRequestRecv( session, req_id, 60 ))) {
 
                 jsonObjectSetKey(response, "status", jsonNewNumberObject(omsg->status_code));
 
@@ -168,7 +168,7 @@
                         char* t = omsg->status_text ? omsg->status_text : "No Error Message";
                         jsonObjectSetKey(response, "debug", jsonNewObject("\n\n%s:\n%s\n", s, t));
                         osrfLogError( OSRF_LOG_MARK,  "Gateway received error: %s",
-                                        jsonObjectGetString(jsonObjectGetKey(response, "debug")));
+                                        jsonObjectGetString(jsonObjectGetKeyConst(response, "debug")));
                         break;
                 }
 
@@ -192,7 +192,7 @@
 	osrfLogDebug( OSRF_LOG_MARK, "gateway process message successfully");
 
 
-	osrf_app_session_destroy(session);
+	osrfAppSessionFree(session);
 
 
 	return OK;