[open-ils-commits] r9626 - trunk/Open-ILS/src/c-apps

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-05-16 09:14:41 -0400 (Fri, 16 May 2008)
New Revision: 9626

Modified:
   trunk/Open-ILS/src/c-apps/oils_dataloader.c
Log:
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




Modified: trunk/Open-ILS/src/c-apps/oils_dataloader.c
===================================================================
--- trunk/Open-ILS/src/c-apps/oils_dataloader.c	2008-05-15 19:45:54 UTC (rev 9625)
+++ trunk/Open-ILS/src/c-apps/oils_dataloader.c	2008-05-16 13:14:41 UTC (rev 9626)
@@ -93,7 +93,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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)) ) {