[open-ils-commits] r15166 - in trunk/Open-ILS/src: c-apps extras (scottmk)

[svn at svn.open-ils.org]

Author: scottmk
Date: 2009-12-15 08:54:51 -0500 (Tue, 15 Dec 2009)
New Revision: 15166

Modified:
   trunk/Open-ILS/src/c-apps/oils_dataloader.c
   trunk/Open-ILS/src/c-apps/oils_utils.c
   trunk/Open-ILS/src/extras/oils_requestor.c
Log:
Replace calls to osrfAppSessionMakeRequest() with
calls to osrfAppSessionSendRequest().

M    Open-ILS/src/c-apps/oils_dataloader.c
M    Open-ILS/src/c-apps/oils_utils.c
M    Open-ILS/src/extras/oils_requestor.c


Modified: trunk/Open-ILS/src/c-apps/oils_dataloader.c
===================================================================
--- trunk/Open-ILS/src/c-apps/oils_dataloader.c	2009-12-15 06:27:09 UTC (rev 15165)
+++ trunk/Open-ILS/src/c-apps/oils_dataloader.c	2009-12-15 13:54:51 UTC (rev 15166)
@@ -161,7 +161,7 @@
 static int commitTransaction () {
 	int ret = 1;
 	const jsonObject* data;
-	int req_id = osrfAppSessionMakeRequest( session, NULL, "open-ils.cstore.transaction.commit", 1, NULL );
+	int req_id = osrfAppSessionSendRequest( session, NULL, "open-ils.cstore.transaction.commit", 1 );
 	osrfMessage* res = osrfAppSessionRequestRecv( session, req_id, 5 );
 	if ( (data = osrfMessageGetResult(res)) ) {
 		if(!(trans_id = jsonObjectGetString(data))) {
@@ -178,7 +178,7 @@
 static int rollbackTransaction () {
 	int ret = 1;
 	const jsonObject* data;
-	int req_id = osrfAppSessionMakeRequest( session, NULL, "open-ils.cstore.transaction.rollback", 1, NULL );
+	int req_id = osrfAppSessionSendRequest( session, NULL, "open-ils.cstore.transaction.rollback", 1 );
 	osrfMessage* res = osrfAppSessionRequestRecv( session, req_id, 5 );
 	if ( (data = osrfMessageGetResult(res)) ) {
 		if(!(trans_id = jsonObjectGetString(data))) {
@@ -195,7 +195,7 @@
 static int startTransaction () {
 	int ret = 1;
 	jsonObject* data;
-	int req_id = osrfAppSessionMakeRequest( session, NULL, "open-ils.cstore.transaction.begin", 1, NULL );
+	int req_id = osrfAppSessionSendRequest( session, NULL, "open-ils.cstore.transaction.begin", 1 );
 	osrfMessage* res = osrfAppSessionRequestRecv( session, req_id, 5 );
 	if ( (data = osrfMessageGetResult(res)) ) {
 		if(!(trans_id = jsonObjectToSimpleString(data))) {
@@ -229,7 +229,7 @@
 	jsonObjectSetIndex( params, 1, jsonParse("{\"quiet\":\"true\"}") );
 
 	jsonObject* data;
-	int req_id = osrfAppSessionMakeRequest( session, params, method_name, 1, NULL );
+	int req_id = osrfAppSessionSendRequest( session, params, method_name, 1 );
 	jsonObjectFree(params);
 
 	osrfMessage* res = osrfAppSessionRequestRecv( session, req_id, 5 );

Modified: trunk/Open-ILS/src/c-apps/oils_utils.c
===================================================================
--- trunk/Open-ILS/src/c-apps/oils_utils.c	2009-12-15 06:27:09 UTC (rev 15165)
+++ trunk/Open-ILS/src/c-apps/oils_utils.c	2009-12-15 13:54:51 UTC (rev 15166)
@@ -119,7 +119,7 @@
 	if(!(service && method)) return NULL;
 	osrfLogDebug(OSRF_LOG_MARK, "oilsUtilsQuickReq(): %s - %s", service, method );
 	osrfAppSession* session = osrfAppSessionClientInit( service ); 
-	int reqid = osrfAppSessionMakeRequest( session, params, method, 1, NULL );
+	int reqid = osrfAppSessionSendRequest( session, params, method, 1 );
 	osrfMessage* omsg = osrfAppSessionRequestRecv( session, reqid, 60 ); 
 	jsonObject* result = jsonObjectClone(osrfMessageGetResult(omsg));
 	osrfMessageFree(omsg);

Modified: trunk/Open-ILS/src/extras/oils_requestor.c
===================================================================
--- trunk/Open-ILS/src/extras/oils_requestor.c	2009-12-15 06:27:09 UTC (rev 15165)
+++ trunk/Open-ILS/src/extras/oils_requestor.c	2009-12-15 13:54:51 UTC (rev 15166)
@@ -112,7 +112,7 @@
 		}
 		
 		osrfAppSession* session = osrfAppSessionClientInit(service);
-		int req_id = osrfAppSessionMakeRequest( session, params, method, 1, NULL );
+		int req_id = osrfAppSessionSendRequest( session, params, method, 1 );
 		osrfMessage* omsg;
 
 		while( (omsg = osrfAppSessionRequestRecv( session, req_id, 120 )) ) {