This patch replaces a couple of deprecated identifiers with their
camelCase equivalents:
osrf_app_client_session_init ==> osrfAppSessionClientInit
osrf_message ==> osrfMessage
Scott McKellar
http://home.swbell.net/mck9/ct/
Developer's Certificate of Origin 1.1 By making a contribution to
this project, I certify that:
(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license indicated
in the file; or
(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source license
and I have the right under that license to submit that work with
modifications, whether created in whole or in part by me, under the
same open source license (unless I am permitted to submit under a
different license), as indicated in the file; or
(c) The contribution was provided directly to me by some other person
who certified (a), (b) or (c) and I have not modified it; and
(d) In the case of each of (a), (b), or (c), I understand and agree
that this project and the contribution are public and that a record
of the contribution (including all personal information I submit
with it, including my sign-off) is maintained indefinitely and may
be redistributed consistent with this project or the open source
license indicated in the file.*** ./trunk/Open-ILS/src/c-apps/oils_dataloader.c 2008-04-12 10:14:58.000000000 -0500
--- ./trunk-mod/Open-ILS/src/c-apps/oils_dataloader.c 2008-04-13 20:24:56.000000000 -0500
***************
*** 93,99 ****
free(idl_filename);
// Connect to open-ils.cstore
! session = osrf_app_client_session_init(CSTORE);
osrfAppSessionConnect(session);
// Start a transaction
--- 93,99 ----
free(idl_filename);
// Connect to open-ils.cstore
! session = osrfAppSessionClientInit(CSTORE);
osrfAppSessionConnect(session);
// Start a transaction
***************
*** 162,168 ****
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 );
if ( (data = osrfMessageGetResult(res)) ) {
if(!(trans_id = jsonObjectGetString(data))) {
ret = 0;
--- 162,168 ----
int ret = 1;
const jsonObject* data;
int req_id = osrfAppSessionMakeRequest( session, NULL, "open-ils.cstore.transaction.commit", 1, NULL );
! osrfMessage* res = osrfAppSessionRequestRecv( session, req_id, 5 );
if ( (data = osrfMessageGetResult(res)) ) {
if(!(trans_id = jsonObjectGetString(data))) {
ret = 0;
***************
*** 179,185 ****
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 );
if ( (data = osrfMessageGetResult(res)) ) {
if(!(trans_id = jsonObjectGetString(data))) {
ret = 0;
--- 179,185 ----
int ret = 1;
const jsonObject* data;
int req_id = osrfAppSessionMakeRequest( session, NULL, "open-ils.cstore.transaction.rollback", 1, NULL );
! osrfMessage* res = osrfAppSessionRequestRecv( session, req_id, 5 );
if ( (data = osrfMessageGetResult(res)) ) {
if(!(trans_id = jsonObjectGetString(data))) {
ret = 0;
***************
*** 196,202 ****
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 );
if ( (data = osrfMessageGetResult(res)) ) {
if(!(trans_id = jsonObjectToSimpleString(data))) {
ret = 0;
--- 196,202 ----
int ret = 1;
jsonObject* data;
int req_id = osrfAppSessionMakeRequest( session, NULL, "open-ils.cstore.transaction.begin", 1, NULL );
! osrfMessage* res = osrfAppSessionRequestRecv( session, req_id, 5 );
if ( (data = osrfMessageGetResult(res)) ) {
if(!(trans_id = jsonObjectToSimpleString(data))) {
ret = 0;
***************
*** 232,238 ****
int req_id = osrfAppSessionMakeRequest( session, params, method_name, 1, NULL );
jsonObjectFree(params);
! osrf_message* res = osrfAppSessionRequestRecv( session, req_id, 5 );
if (res) {
if ( !(data = osrfMessageGetResult(res)) ) {
--- 232,238 ----
int req_id = osrfAppSessionMakeRequest( session, params, method_name, 1, NULL );
jsonObjectFree(params);
! osrfMessage* res = osrfAppSessionRequestRecv( session, req_id, 5 );
if (res) {
if ( !(data = osrfMessageGetResult(res)) ) {
