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

git-svn-id: svn://svn.open-ils.org/ILS/trunk@15166 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/c-apps/oils_dataloader.c b/Open-ILS/src/c-apps/oils_dataloader.c
index 1396191..aa9b802 100644 (file)
--- a/Open-ILS/src/c-apps/oils_dataloader.c
+++ b/Open-ILS/src/c-apps/oils_dataloader.c
@@ -161,7 +161,7 @@ int main (int argc, char **argv) {
 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 commitTransaction () {
 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 rollbackTransaction () {
 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 @@ static int sendCommand ( const char* json ) {
        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 );

diff --git a/Open-ILS/src/c-apps/oils_utils.c b/Open-ILS/src/c-apps/oils_utils.c
index ac88d8e..d8b6929 100644 (file)
--- a/Open-ILS/src/c-apps/oils_utils.c
+++ b/Open-ILS/src/c-apps/oils_utils.c
@@ -119,7 +119,7 @@ jsonObject* oilsUtilsQuickReq( const char* service, const char* method,
        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);

diff --git a/Open-ILS/src/extras/oils_requestor.c b/Open-ILS/src/extras/oils_requestor.c
index cb674a3..a95ae95 100644 (file)
--- a/Open-ILS/src/extras/oils_requestor.c
+++ b/Open-ILS/src/extras/oils_requestor.c
@@ -112,7 +112,7 @@ static int do_request( char* request ) {
                }
                
                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 )) ) {