Changeset 9629

Timestamp:

05/16/08 16:38:15 (5 months ago)

Author:

erickson

Message:

Merged revisions 9626-9627 via svnmerge from
svn://svn.open-ils.org/ILS/trunk

........

r9626 | erickson | 2008-05-16 09:14:41 -0400 (Fri, 16 May 2008) | 10 lines

Patch from Scott McKellar?:

This patch replaces a couple of deprecated identifiers with their
camelCase equivalents:

osrf_app_client_session_init ==> osrfAppSessionClientInit
osrf_message ==> osrfMessage

........

r9627 | erickson | 2008-05-16 09:15:45 -0400 (Fri, 16 May 2008) | 8 lines

Patch from Scott McKellar?:

This patch replaces a deprecated identifier with its camelCase
equivalent.

osrf_app_client_session_init ==> osrfAppSessionClientInit

........

Location:

branches/acq-experiment

Files:

• . (modified) (1 prop)
• Open-ILS/src/c-apps/oils_dataloader.c (modified) (5 diffs)
• Open-ILS/src/extras/oils_requestor.c (modified) (1 diff)

branches/acq-experiment/Open-ILS/src/c-apps/oils_dataloader.c

@@ -94 +94 @@
 
         // Connect to open-ils.cstore
-        session = osrf_app_client_session_init(CSTORE);
+        session = osrfAppSessionClientInit(CSTORE);
         osrfAppSessionConnect(session);
 
@@ -163 +163 @@
         const jsonObject* data;
         int req_id = osrfAppSessionMakeRequest( session, NULL, "open-ils.cstore.transaction.commit", 1, NULL );
-        osrf_message* res = osrfAppSessionRequestRecv( session, req_id, 5 );
+        osrfMessage* res = osrfAppSessionRequestRecv( session, req_id, 5 );
         if ( (data = osrfMessageGetResult(res)) ) {
                 if(!(trans_id = jsonObjectGetString(data))) {
@@ -180 +180 @@
         const jsonObject* data;
         int req_id = osrfAppSessionMakeRequest( session, NULL, "open-ils.cstore.transaction.rollback", 1, NULL );
-        osrf_message* res = osrfAppSessionRequestRecv( session, req_id, 5 );
+        osrfMessage* res = osrfAppSessionRequestRecv( session, req_id, 5 );
         if ( (data = osrfMessageGetResult(res)) ) {
                 if(!(trans_id = jsonObjectGetString(data))) {
@@ -197 +197 @@
         jsonObject* data;
         int req_id = osrfAppSessionMakeRequest( session, NULL, "open-ils.cstore.transaction.begin", 1, NULL );
-        osrf_message* res = osrfAppSessionRequestRecv( session, req_id, 5 );
+        osrfMessage* res = osrfAppSessionRequestRecv( session, req_id, 5 );
         if ( (data = osrfMessageGetResult(res)) ) {
                 if(!(trans_id = jsonObjectToSimpleString(data))) {
@@ -233 +233 @@
         jsonObjectFree(params);
 
-        osrf_message* res = osrfAppSessionRequestRecv( session, req_id, 5 );
+        osrfMessage* res = osrfAppSessionRequestRecv( session, req_id, 5 );
 
         if (res) {

branches/acq-experiment/Open-ILS/src/extras/oils_requestor.c

@@ -112 +112 @@
                 }
                 
-                osrfAppSession* session = osrf_app_client_session_init(service);
+                osrfAppSession* session = osrfAppSessionClientInit(service);
                 int req_id = osrfAppSessionMakeRequest( session, params, method, 1, NULL );
                 osrfMessage* omsg;