From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 16 May 2008 20:38:15 +0000 (+0000)
Subject: Merged revisions 9626-9627 via svnmerge from
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=5e65b21e956fc2cc43f18f1f6752567ce79aa50d;p=Evergreen.git

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
........


git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@9629 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 3ebe2f9205..a071963226 100644
--- a/Open-ILS/src/c-apps/oils_dataloader.c
+++ b/Open-ILS/src/c-apps/oils_dataloader.c
@@ -93,7 +93,7 @@ int main (int argc, char **argv) {
 	free(idl_filename);
 
 	// Connect to open-ils.cstore
-	session = osrf_app_client_session_init(CSTORE);
+	session = osrfAppSessionClientInit(CSTORE);
 	osrfAppSessionConnect(session);
 
 	// Start a transaction
@@ -162,7 +162,7 @@ static int commitTransaction () {
 	int ret = 1;
 	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))) {
 			ret = 0;
@@ -179,7 +179,7 @@ static int rollbackTransaction () {
 	int ret = 1;
 	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))) {
 			ret = 0;
@@ -196,7 +196,7 @@ static int startTransaction () {
 	int ret = 1;
 	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))) {
 			ret = 0;
@@ -232,7 +232,7 @@ static int sendCommand ( const char* json ) {
 	int req_id = osrfAppSessionMakeRequest( session, params, method_name, 1, NULL );
 	jsonObjectFree(params);
 
-	osrf_message* res = osrfAppSessionRequestRecv( session, req_id, 5 );
+	osrfMessage* res = osrfAppSessionRequestRecv( session, req_id, 5 );
 
 	if (res) {
 		if ( !(data = osrfMessageGetResult(res)) ) {
diff --git a/Open-ILS/src/extras/oils_requestor.c b/Open-ILS/src/extras/oils_requestor.c
index 53effc2632..32904505d0 100644
--- a/Open-ILS/src/extras/oils_requestor.c
+++ b/Open-ILS/src/extras/oils_requestor.c
@@ -111,7 +111,7 @@ static int do_request( char* request ) {
 			buffer_free(buffer);
 		}
 		
-		osrfAppSession* session = osrf_app_client_session_init(service);
+		osrfAppSession* session = osrfAppSessionClientInit(service);
 		int req_id = osrfAppSessionMakeRequest( session, params, method, 1, NULL );
 		osrfMessage* omsg;