[open-ils-commits] r9629 - in branches/acq-experiment: . Open-ILS/src/c-apps Open-ILS/src/extras

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-05-16 16:38:15 -0400 (Fri, 16 May 2008)
New Revision: 9629

Modified:
   branches/acq-experiment/
   branches/acq-experiment/Open-ILS/src/c-apps/oils_dataloader.c
   branches/acq-experiment/Open-ILS/src/extras/oils_requestor.c
Log:
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
........



Property changes on: branches/acq-experiment
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk:1-9624
   + /trunk:1-9628

Modified: branches/acq-experiment/Open-ILS/src/c-apps/oils_dataloader.c
===================================================================
--- branches/acq-experiment/Open-ILS/src/c-apps/oils_dataloader.c	2008-05-16 16:18:51 UTC (rev 9628)
+++ branches/acq-experiment/Open-ILS/src/c-apps/oils_dataloader.c	2008-05-16 20:38:15 UTC (rev 9629)
@@ -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)) ) {

Modified: branches/acq-experiment/Open-ILS/src/extras/oils_requestor.c
===================================================================
--- branches/acq-experiment/Open-ILS/src/extras/oils_requestor.c	2008-05-16 16:18:51 UTC (rev 9628)
+++ branches/acq-experiment/Open-ILS/src/extras/oils_requestor.c	2008-05-16 20:38:15 UTC (rev 9629)
@@ -111,7 +111,7 @@
 			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;