[Refdb-cvs] CVS: refdb/src backend-bibtex.c,1.16.2.2,1.16.2.3 backend-dbib.c,1.28.2.4,1.28.2.5 backe
Status: Beta
Brought to you by:
mhoenicka
Menu
▾
▴
[Refdb-cvs] CVS: refdb/src backend-bibtex.c,1.16.2.2,1.16.2.3 backend-dbib.c,1.28.2.4,1.28.2.5 backend-dbiba.c,1.26.2.9,1.26.2.10 backend.c,1.27.2.2,1.27.2.3 dbfncs.c,1.15.2.10,1.15.2.11 dbfncs.h,1.6.2.3,1.6.2.4 noteshandler.c,1.18.2.5,1.18.2.6 noteshandler.h,1.6,1.6.2.1 refdbda.c,1.41.2.14,1.41.2.15 refdbdbib.c,1.36.2.19,1.36.2.20 refdbdnote.c,1.25.2.6,1.25.2.7 refdbdref.c,1.65.2.12,1.65.2.13 risdata.c,1.5.2.2,1.5.2.3 risdb.c,1.44.2.4,1.44.2.5 risxhandler.c,1.28.2.8,1.28.2.9 xmlhandler.c,1.22.2.15,1.22.2.16
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29265 Modified Files: Tag: Release_0_9_5_stable backend-bibtex.c backend-dbib.c backend-dbiba.c backend.c dbfncs.c dbfncs.h noteshandler.c noteshandler.h refdbda.c refdbdbib.c refdbdnote.c refdbdref.c risdata.c risdb.c risxhandler.c xmlhandler.c Log Message: ported to libdbi 0.8.0 API Index: backend-bibtex.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-bibtex.c,v retrieving revision 1.16.2.2 retrieving revision 1.16.2.3 diff -u -U2 -r1.16.2.2 -r1.16.2.3 --- backend-bibtex.c 17 Apr 2005 00:09:06 -0000 1.16.2.2 +++ backend-bibtex.c 26 Jul 2005 20:21:43 -0000 1.16.2.3 @@ -152,5 +152,5 @@ /* retrieve basic information about the bibliography style from CITSTYLE into ptr_result */ quoted_journal = mstrdup((ptr_rendinfo->ptr_biblio_info)->format_string); - if (!dbi_driver_quote_string(driver, "ed_journal)) { + if (!dbi_conn_quote_string(bibconns.conn, "ed_journal)) { LOG_PRINT(LOG_CRIT, get_status_msg(801)); free(sql_command); Index: backend-dbib.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-dbib.c,v retrieving revision 1.28.2.4 retrieving revision 1.28.2.5 diff -u -U2 -r1.28.2.4 -r1.28.2.5 --- backend-dbib.c 15 Apr 2005 22:45:05 -0000 1.28.2.4 +++ backend-dbib.c 26 Jul 2005 20:21:43 -0000 1.28.2.5 @@ -83,5 +83,5 @@ } - if (dbi_driver_quote_string(dbi_conn_get_driver(conn), &myjournal) == -1) { + if (dbi_conn_quote_string(conn, &myjournal) == 0) { free(myjournal); return 801; @@ -260,5 +260,5 @@ } - if (dbi_driver_quote_string(dbi_conn_get_driver(ptr_bibconns->conn_refdb), &myjournal) == -1) { + if (dbi_conn_quote_string(ptr_bibconns->conn_refdb, &myjournal) == 0) { delete_all_lilimem(&sentinel); return 801; @@ -609,5 +609,5 @@ author_concat = dbi_result_get_string(dbires2, "author_concat"); - n_currpos = dbi_result_get_long(dbires2, "sorted_pos"); + n_currpos = dbi_result_get_int(dbires2, "sorted_pos"); n_pubyear = dbi_result_get_short(dbires2, "pubyear"); @@ -870,5 +870,5 @@ } - if (dbi_driver_quote_string(dbi_conn_get_driver(ptr_bibconns->conn_refdb), &myjournal) == -1) { + if (dbi_conn_quote_string(ptr_bibconns->conn_refdb, &myjournal) == 0) { delete_all_lilimem(&sentinel); return 801; @@ -1163,5 +1163,5 @@ } else { - *ptr_ref = new_ref; +/* *ptr_ref = new_ref; */ } free(sql_command); Index: backend-dbiba.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-dbiba.c,v retrieving revision 1.26.2.9 retrieving revision 1.26.2.10 diff -u -U2 -r1.26.2.9 -r1.26.2.10 --- backend-dbiba.c 15 Apr 2005 22:45:05 -0000 1.26.2.9 +++ backend-dbiba.c 26 Jul 2005 20:21:43 -0000 1.26.2.10 @@ -516,5 +516,5 @@ /* depending on the total number of authors we need different preceedings and followings */ num_authors = dbi_result_get_numrows(dbires_author); -/* printf("num_authors went to %d<<\n", num_authors); */ +/* fprintf(stderr, "num_authors went to %d<<\n", num_authors); */ if (num_authors > 1) { author_preceeding = my_dbi_result_get_string_copy_idx(dbires_ref, n_multiplepreceeding_index); @@ -845,5 +845,5 @@ free(item); } -/* printf("end format_authorlist():%s\n", *ref); */ +/* printf("end format_authorlist():%s\n", *ptr_ref); */ if (!nhave_content) { @@ -993,5 +993,5 @@ } -/* printf("in format_pubdate. year_unique_suffix=%s; type=%d, nis_intext=%d<<\n", year_unique_suffix, type, nis_intext); */ +/* printf("in format_pubdate. year_unique_suffix=%s; type=%d, n_intext=%d<<\n", year_unique_suffix, type, n_intext); */ /* conn = dbi_result_get_conn(dbires); */ @@ -1474,5 +1474,5 @@ } -/* printf("done with format_pubdate. ref=%s<<\n", *ref); */ +/* printf("done with format_pubdate. ptr_ref=%s<<\n", *ptr_ref); */ if (!nhave_content) { (*ptr_ref)[0] ='\0'; Index: backend.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend.c,v retrieving revision 1.27.2.2 retrieving revision 1.27.2.3 diff -u -U2 -r1.27.2.2 -r1.27.2.3 --- backend.c 5 Jun 2005 00:50:43 -0000 1.27.2.2 +++ backend.c 26 Jul 2005 20:21:44 -0000 1.27.2.3 @@ -2087,5 +2087,5 @@ char* myresult; unsigned short n_field_type; - unsigned int n_stringsize; + size_t n_stringsize; n_field_type = dbi_result_get_field_type(dbires, fieldname); @@ -2099,5 +2099,5 @@ } else { - n_stringsize = dbi_result_get_field_size(dbires, fieldname); + n_stringsize = dbi_result_get_field_length(dbires, fieldname); /* need one extra byte for a terminating \0 */ @@ -2145,5 +2145,5 @@ char* myresult; unsigned short n_field_type; - unsigned int n_stringsize; + size_t n_stringsize; n_field_type = dbi_result_get_field_type_idx(dbires, idx); @@ -2157,5 +2157,5 @@ } else { - n_stringsize = dbi_result_get_field_size_idx(dbires, idx); + n_stringsize = dbi_result_get_field_length_idx(dbires, idx); /* need one extra byte for a terminating \0 */ @@ -2205,5 +2205,5 @@ implementation is necessary if dbi does *not* return the \0 */ - unsigned int n_stringsize; + size_t n_stringsize; char *myresult; const char *result; @@ -2221,5 +2221,5 @@ } - n_stringsize = dbi_result_get_field_size(Result, fieldname); + n_stringsize = dbi_result_get_field_length(Result, fieldname); /* need one extra byte for a terminating \0 */ @@ -2374,5 +2374,5 @@ unsigned long long n_id; dbi_result dbires1; - dbi_driver driver; + dbi_conn conn; sql_command = (char*)malloc(256); @@ -2382,5 +2382,5 @@ } - driver = dbi_conn_get_driver(dbi_result_get_conn(dbires)); + conn = dbi_result_get_conn(dbires); quoted_username = mstrdup(username); @@ -2389,5 +2389,5 @@ return -1; } - if (dbi_driver_quote_string(driver, "ed_username) == -1) { + if (dbi_conn_quote_string(conn, "ed_username) == 0) { free(quoted_username); free(sql_command); @@ -2397,5 +2397,5 @@ n_id = my_dbi_result_get_idval(dbires, "refdb_id"); - if (username != NULL && !dbi_conn_error_flag(dbi_result_get_conn(dbires))) { + if (username != NULL && !dbi_conn_error_flag(conn)) { sprintf(sql_command, "SELECT t_xuser.xuser_id FROM t_xuser, t_user WHERE t_xuser.user_id=t_user.user_id AND t_user.user_name=%s AND t_xuser.refdb_id="ULLSPEC, quoted_username, (unsigned long long)n_id); } Index: dbfncs.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/dbfncs.c,v retrieving revision 1.15.2.10 retrieving revision 1.15.2.11 diff -u -U2 -r1.15.2.10 -r1.15.2.11 --- dbfncs.c 28 May 2005 20:13:09 -0000 1.15.2.10 +++ dbfncs.c 26 Jul 2005 20:21:45 -0000 1.15.2.11 @@ -2119,5 +2119,5 @@ dbi_conn conn; char buffer[512]; - unsigned long the_ulong; + unsigned int the_uint; unsigned long long the_ulonglong; @@ -2127,8 +2127,8 @@ /* database server does not support long long ints, retrieve as long int instead and cast */ - the_ulong = dbi_result_get_ulong(dbires, fieldname); + the_uint = dbi_result_get_uint(dbires, fieldname); /* sprintf(buffer, "ulong: u %u<< lu %lu<< llu %llu", the_ulong, the_ulong, the_ulong); */ /* LOG_PRINT(LOG_DEBUG, buffer); */ - return (unsigned long long)the_ulong; + return (unsigned long long)the_uint; } else { @@ -2149,8 +2149,8 @@ dbi_result dbires result of a previous query - unsigned long long idx index of field to query + unsigned int idx index of field to query ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -unsigned long long my_dbi_result_get_idval_idx(dbi_result dbires, unsigned short idx) { +unsigned long long my_dbi_result_get_idval_idx(dbi_result dbires, unsigned int idx) { dbi_conn conn; @@ -2160,5 +2160,5 @@ /* database server does not support long long ints, retrieve as long int instead and cast */ - return (unsigned long long)dbi_result_get_ulong_idx(dbires, idx); + return (unsigned long long)dbi_result_get_uint_idx(dbires, idx); } else { Index: dbfncs.h =================================================================== RCS file: /cvsroot/refdb/refdb/src/dbfncs.h,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -u -U2 -r1.6.2.3 -r1.6.2.4 --- dbfncs.h 28 May 2005 20:13:09 -0000 1.6.2.3 +++ dbfncs.h 26 Jul 2005 20:21:45 -0000 1.6.2.4 @@ -58,5 +58,5 @@ const char* my_dbi_driver_get_cap(dbi_driver driver, const char* cap); unsigned long long my_dbi_result_get_idval(dbi_result dbires, const char* fieldname); -unsigned long long my_dbi_result_get_idval_idx(dbi_result dbires, unsigned short idx); +unsigned long long my_dbi_result_get_idval_idx(dbi_result dbires, unsigned int idx); int my_dbi_conn_get_versioninfo(dbi_conn conn, struct VERSIONINFO* ptr_ver); Index: noteshandler.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/noteshandler.c,v retrieving revision 1.18.2.5 retrieving revision 1.18.2.6 diff -u -U2 -r1.18.2.5 -r1.18.2.6 --- noteshandler.c 5 May 2005 17:21:34 -0000 1.18.2.5 +++ noteshandler.c 26 Jul 2005 20:21:45 -0000 1.18.2.6 @@ -49,6 +49,6 @@ /* forward declaration of local functions */ -static int set_notesdata_field(const char* field, const char* value, dbi_conn conn, dbi_driver driver, unsigned long long n_note_id); -static int set_notesdata_int_field(const char* field, unsigned long long n_value, dbi_conn conn, dbi_driver driver, unsigned long long n_note_id); +static int set_notesdata_field(const char* field, const char* value, dbi_conn conn, unsigned long long n_note_id); +static int set_notesdata_int_field(const char* field, unsigned long long n_value, dbi_conn conn, unsigned long long n_note_id); @@ -460,5 +460,5 @@ /* } */ - result = set_notesdata_int_field("user_id", ptr_andata->n_user_id, ptr_andata->conn, ptr_andata->driver, ptr_andata->n_note_id); + result = set_notesdata_int_field("user_id", ptr_andata->n_user_id, ptr_andata->conn, ptr_andata->n_note_id); if (result == 1) { @@ -704,5 +704,5 @@ result = 0; - result = set_notesdata_field("title", (ptr_andata->ptr_first)->ptr_elvalue, ptr_andata->conn, ptr_andata->driver, ptr_andata->n_note_id); + result = set_notesdata_field("title", (ptr_andata->ptr_first)->ptr_elvalue, ptr_andata->conn, ptr_andata->n_note_id); if (result == 1) { @@ -727,5 +727,5 @@ target = get_attr(ptr_andata->ptr_first, "target"); - result = insert_link(type, target, ptr_andata->conn, ptr_andata->driver, ptr_andata->n_note_id); + result = insert_link(type, target, ptr_andata->conn, ptr_andata->n_note_id); if (result == 1 /* out of memory */) { @@ -825,5 +825,5 @@ else if (!strcmp(el, "content")) { if (ptr_andata->notepool && *(ptr_andata->notepool)) { - result = set_notesdata_field("content", ptr_andata->notepool, ptr_andata->conn, ptr_andata->driver, ptr_andata->n_note_id); + result = set_notesdata_field("content", ptr_andata->notepool, ptr_andata->conn, ptr_andata->n_note_id); /* printf("notepool went to %s<<\n", ptr_andata->notepool); */ free(ptr_andata->notepool); @@ -831,5 +831,5 @@ } else if (ptr_andata->ptr_first->ptr_elvalue && *ptr_andata->ptr_first->ptr_elvalue) { - result = set_notesdata_field("content", ptr_andata->ptr_first->ptr_elvalue, ptr_andata->conn, ptr_andata->driver, ptr_andata->n_note_id); + result = set_notesdata_field("content", ptr_andata->ptr_first->ptr_elvalue, ptr_andata->conn, ptr_andata->n_note_id); } @@ -861,5 +861,5 @@ if (*(ptr_andata->content_type)) { - result = set_notesdata_field("content_type", ptr_andata->content_type, ptr_andata->conn, ptr_andata->driver, ptr_andata->n_note_id); + result = set_notesdata_field("content_type", ptr_andata->content_type, ptr_andata->conn, ptr_andata->n_note_id); if (result == 1) { @@ -877,5 +877,5 @@ if (*(ptr_andata->content_xmllang)) { - result = set_notesdata_field("content_xmllang", ptr_andata->content_xmllang, ptr_andata->conn, ptr_andata->driver, ptr_andata->n_note_id); + result = set_notesdata_field("content_xmllang", ptr_andata->content_xmllang, ptr_andata->conn, ptr_andata->n_note_id); if (result == 1) { @@ -964,5 +964,5 @@ key = get_unique_citekey(ptr_andata->conn, ptr_andata->user, atoi(ptr_andata->year), ptr_andata->n_note_id, 1 /* notes */); - if (key && set_notesdata_field("key", key, ptr_andata->conn, ptr_andata->driver, ptr_andata->n_note_id) != 0) { + if (key && set_notesdata_field("key", key, ptr_andata->conn, ptr_andata->n_note_id) != 0) { if (key) { free((char*)key); @@ -978,5 +978,5 @@ /* set date */ - result = set_notesdata_field("date", ptr_andata->date_buffer, ptr_andata->conn, ptr_andata->driver, ptr_andata->n_note_id); + result = set_notesdata_field("date", ptr_andata->date_buffer, ptr_andata->conn, ptr_andata->n_note_id); /* close transaction, if any */ @@ -1183,10 +1183,8 @@ dbi_conn conn connection to database server - dbi_driver driver database driver - unsigned long long n_note_id id value of note ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -static int set_notesdata_field(const char* field, const char* value, dbi_conn conn, dbi_driver driver, unsigned long long n_note_id) { +static int set_notesdata_field(const char* field, const char* value, dbi_conn conn, unsigned long long n_note_id) { char* sql_command; char* new_sql_command; @@ -1214,5 +1212,5 @@ return 1; } - if (dbi_driver_quote_string(driver, "ed_value) == -1) { + if (dbi_conn_quote_string(conn, "ed_value) == 0) { free(quoted_value); LOG_PRINT(LOG_WARNING, "malloc failed"); @@ -1250,10 +1248,8 @@ dbi_conn conn connection to database server - dbi_driver driver database driver - unsigned long long n_note_id id value of note ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -static int set_notesdata_int_field(const char* field, unsigned long long n_value, dbi_conn conn, dbi_driver driver, unsigned long long n_note_id) { +static int set_notesdata_int_field(const char* field, unsigned long long n_value, dbi_conn conn, unsigned long long n_note_id) { char* sql_command; char* new_sql_command; @@ -1303,10 +1299,8 @@ dbi_conn conn connection to database server - dbi_driver driver database driver - unsigned long long n_note_id id value of note ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -int insert_link(const char* type, const char* target, dbi_conn conn, dbi_driver driver, unsigned long long n_note_id) { +int insert_link(const char* type, const char* target, dbi_conn conn, unsigned long long n_note_id) { char* sql_command; char* new_sql_command; @@ -1339,5 +1333,5 @@ /* quote target to make it usable for a SQL query */ if ((quoted_target = strdup(target)) == NULL - || dbi_driver_quote_string(driver, "ed_target) == -1) { + || dbi_conn_quote_string(conn, "ed_target) == 0) { LOG_PRINT(LOG_WARNING, "malloc failed"); free(sql_command); Index: noteshandler.h =================================================================== RCS file: /cvsroot/refdb/refdb/src/noteshandler.h,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -U2 -r1.6 -r1.6.2.1 --- noteshandler.h 15 Feb 2004 23:37:57 -0000 1.6 +++ noteshandler.h 26 Jul 2005 20:21:45 -0000 1.6.2.1 @@ -60,3 +60,3 @@ void notes_char_handler(void *ptr_data, const char *string, int len); -int insert_link(const char* type, const char* target, dbi_conn conn, dbi_driver driver, unsigned long long n_note_id); +int insert_link(const char* type, const char* target, dbi_conn conn, unsigned long long n_note_id); Index: refdbda.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbda.c,v retrieving revision 1.41.2.14 retrieving revision 1.41.2.15 diff -u -U2 -r1.41.2.14 -r1.41.2.15 --- refdbda.c 29 May 2005 19:38:17 -0000 1.41.2.14 +++ refdbda.c 26 Jul 2005 20:21:45 -0000 1.41.2.15 @@ -815,5 +815,5 @@ /* escape any characters that the database server cannot digest */ - if (dbi_driver_quote_string(driver, &myarg) == -1) { + if (dbi_conn_quote_string(conn, &myarg) == 0) { dbi_conn_close(conn); free(myarg); @@ -911,5 +911,5 @@ /* escape any characters that the database server cannot digest */ - if (dbi_driver_quote_string(driver, &myarg) == -1) { + if (dbi_conn_quote_string(conn, &myarg) == 0) { dbi_conn_close(conn); free(myarg); @@ -2001,5 +2001,5 @@ /* escape any characters that the database server cannot digest */ - if (dbi_driver_quote_string(driver, &mytoken) == -1) { + if (dbi_conn_quote_string(conn, &mytoken) == 0) { free(mytoken); ptr_addresult->failure++; @@ -2123,5 +2123,5 @@ /* escape any characters that the database server cannot digest */ - if (dbi_driver_quote_string(driver, &myarg) == -1) { + if (dbi_conn_quote_string(conn, &myarg) == 0) { send_status(ptr_clrequest->fd, 801, TERM_NO); LOG_PRINT(LOG_CRIT, get_status_msg(801)); Index: refdbdbib.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbdbib.c,v retrieving revision 1.36.2.19 retrieving revision 1.36.2.20 diff -u -U2 -r1.36.2.19 -r1.36.2.20 --- refdbdbib.c 21 May 2005 23:47:10 -0000 1.36.2.19 +++ refdbdbib.c 26 Jul 2005 20:21:46 -0000 1.36.2.20 @@ -308,5 +308,5 @@ } - if (dbi_driver_quote_string(dbi_conn_get_driver(bibconns.conn_refdb), &myjournal) == -1) { + if (dbi_conn_quote_string(bibconns.conn_refdb, &myjournal) == 0) { LOG_PRINT(LOG_CRIT, get_status_msg(801)); send_status(ptr_clrequest->fd, 801, TERM_NO); @@ -817,5 +817,5 @@ } - n_currpos = dbi_result_get_long(dbires, "sorted_pos"); + n_currpos = dbi_result_get_int(dbires, "sorted_pos"); if ((!n_currpos && dbi_conn_error_flag(bibconns.conn))) { ptr_addresult->failure++; @@ -1285,5 +1285,5 @@ } - if ((n_status = format_entry(&authorlist_buffer, &authorlist_buffer_len, pubtype, ptr_bibconns, dbires_cit, NULL, item, ptr_clrequest->username, 0, current_mset, biblio_info)) != 0) { + if ((n_status = format_entry(&authorlist_buffer, &authorlist_buffer_len, pubtype, ptr_bibconns, dbires_cit, NULL /* authorlist only */, item, ptr_clrequest->username, 0, current_mset, biblio_info)) != 0) { append_return_msg(ptr_addresult, n_status, NULL, ptr_bibconns->conn); free(id_string); @@ -1292,4 +1292,5 @@ return n_status; } +/* printf("authorlist_buffer:%s<< len:%d\n", authorlist_buffer, authorlist_buffer_len); */ if (strcmp(my_dbi_conn_get_cap(ptr_bibconns->conn, "multiple_db"), "t")) { @@ -1298,5 +1299,5 @@ } - if (dbi_driver_quote_string(dbi_conn_get_driver(ptr_bibconns->conn), &authorlist_buffer) == -1) { + if (dbi_conn_quote_string(ptr_bibconns->conn, &authorlist_buffer) == 0) { append_return_msg(ptr_addresult, 801, NULL, ptr_bibconns->conn); free(id_string); @@ -1323,5 +1324,5 @@ } } - + sprintf(sql_command, "UPDATE %s SET author_abbrevlist=%s WHERE entry_id='%s'", table_name, authorlist_buffer, biblio_info->entry_id); LOG_PRINT(LOG_DEBUG, sql_command); @@ -1356,5 +1357,5 @@ /* quote item */ - if (dbi_driver_quote_string(dbi_conn_get_driver(ptr_bibconns->conn), (char**)&item) == -1) { + if (dbi_conn_quote_string(ptr_bibconns->conn, (char**)&item) == 0) { append_return_msg(ptr_addresult, 241, NULL, ptr_bibconns->conn); free(sql_command); @@ -1687,5 +1688,5 @@ of (un-)successfully deleted styles - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ int deletestyle(struct CLIENT_REQUEST* ptr_clrequest, struct ADDRESULT* ptr_addresult) { dbi_conn conn; @@ -1747,5 +1748,5 @@ } - if (dbi_driver_quote_string(driver, &myarg) == -1) { + if (dbi_conn_quote_string(conn, &myarg) == 0) { send_status(ptr_clrequest->fd, 801, TERM_NO); LOG_PRINT(LOG_CRIT, get_status_msg(801)); @@ -1865,5 +1866,5 @@ } - if (dbi_driver_quote_string(driver, &myarg) == -1) { + if (dbi_conn_quote_string(conn, &myarg) == 0) { LOG_PRINT(LOG_CRIT, get_status_msg(801)); send_status(ptr_clrequest->fd, 801, TERM_NO); @@ -2437,5 +2438,5 @@ } - if ((author_concat_q = strdup(author_concat)) == NULL || dbi_driver_quote_string(dbi_conn_get_driver(conn), &author_concat_q) == -1) { + if ((author_concat_q = strdup(author_concat)) == NULL || dbi_conn_quote_string(conn, &author_concat_q) == 0) { return -1; } Index: refdbdnote.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbdnote.c,v retrieving revision 1.25.2.6 retrieving revision 1.25.2.7 diff -u -U2 -r1.25.2.6 -r1.25.2.7 --- refdbdnote.c 29 May 2005 19:35:37 -0000 1.25.2.6 +++ refdbdnote.c 26 Jul 2005 20:21:46 -0000 1.25.2.7 @@ -906,5 +906,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -952,5 +952,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -1025,5 +1025,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -1165,5 +1165,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -1211,5 +1211,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -1278,5 +1278,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -1417,5 +1417,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -1463,5 +1463,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -1530,5 +1530,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -1724,5 +1724,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -1851,5 +1851,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -2027,5 +2027,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -2604,5 +2604,5 @@ /* add links */ if (!n_remove) { - result = insert_link(my_type, ptr_curr->value, conn, dbi_conn_get_driver(conn), n_id); + result = insert_link(my_type, ptr_curr->value, conn, n_id); /* todo: fix output */ @@ -2641,5 +2641,5 @@ else { if ((quoted_token = strdup(ptr_curr->value)) == NULL - || dbi_driver_quote_string(driver, "ed_token) == -1) { + || dbi_conn_quote_string(conn, "ed_token) == 0) { send_status(ptr_clrequest->fd, 801, TERM_NO); LOG_PRINT(LOG_CRIT, get_status_msg(801)); Index: refdbdref.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbdref.c,v retrieving revision 1.65.2.12 retrieving revision 1.65.2.13 diff -u -U2 -r1.65.2.12 -r1.65.2.13 --- refdbdref.c 12 Jun 2005 21:09:29 -0000 1.65.2.12 +++ refdbdref.c 26 Jul 2005 20:21:46 -0000 1.65.2.13 @@ -2279,5 +2279,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -2329,5 +2329,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -2408,5 +2408,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -2546,5 +2546,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -2592,5 +2592,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -2665,5 +2665,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -2828,5 +2828,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -3004,5 +3004,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -3080,5 +3080,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -3202,5 +3202,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -3249,5 +3249,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -3395,5 +3395,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -3808,5 +3808,5 @@ break; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { retval = 1; break; @@ -3938,5 +3938,5 @@ return 1; } - if (dbi_driver_quote_string(driver, "ed_token) == -1) { + if (dbi_conn_quote_string(conn, "ed_token) == 0) { dbi_conn_close(conn); delete_all_lilimem(&sentinel); Index: risdata.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/risdata.c,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -u -U2 -r1.5.2.2 -r1.5.2.3 --- risdata.c 29 May 2005 16:55:11 -0000 1.5.2.2 +++ risdata.c 26 Jul 2005 20:21:46 -0000 1.5.2.3 @@ -170,8 +170,8 @@ const char* fieldvalue the data proper - dbi_driver dbidrv the database driver + dbi_conn conn the database connection ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -int set_risdata_field(struct RISDATA* ptr_risdata, const char* fieldname, const char* fieldvalue, dbi_driver dbidrv) { +int set_risdata_field(struct RISDATA* ptr_risdata, const char* fieldname, const char* fieldvalue, dbi_conn conn) { char* escape_buffer; char buffer[256]; /* buffer for log message */ @@ -193,5 +193,5 @@ /* escape any characters that the db cannot digest */ - if (dbi_driver_quote_string(dbidrv, &escape_buffer) == -1) { + if (dbi_conn_quote_string(conn, &escape_buffer) == 0) { free(escape_buffer); LOG_PRINT(LOG_WARNING, "malloc failed"); @@ -366,5 +366,5 @@ /* escape any characters that the database server cannot digest */ - if (dbi_driver_quote_string(driver, &escape_buffer) == -1) { + if (dbi_driver_quote_string(driver, &escape_buffer) == 0) { LOG_PRINT(LOG_WARNING, "out of memory"); free(escape_buffer); Index: risdb.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/risdb.c,v retrieving revision 1.44.2.4 retrieving revision 1.44.2.5 diff -u -U2 -r1.44.2.4 -r1.44.2.5 --- risdb.c 5 May 2005 17:21:36 -0000 1.44.2.4 +++ risdb.c 26 Jul 2005 20:21:46 -0000 1.44.2.5 @@ -139,5 +139,5 @@ strup(mytoken); /* convert token to uppercase */ - if (dbi_driver_quote_string(dbi_conn_get_driver(conn), &mytoken) == -1) { + if (dbi_conn_quote_string(conn, &mytoken) == 0) { free(dest); free(mytoken); @@ -764,5 +764,5 @@ } - result = set_risdata_field(ptr_risdata, "type", &token[6], driver); + result = set_risdata_field(ptr_risdata, "type", &token[6], conn); if (result) { sprintf(sql_command, "233:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); @@ -933,5 +933,5 @@ else if (strncmp("SP - ", token, 6) == 0) { /* start page number */ - result = set_risdata_field(ptr_risdata, "startpage", &token[6], driver); + result = set_risdata_field(ptr_risdata, "startpage", &token[6], conn); if (result) { sprintf(sql_command, "233:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); @@ -952,5 +952,5 @@ else if (strncmp("EP - ", token, 6) == 0) { /* end page number */ - result = set_risdata_field(ptr_risdata, "endpage", &token[6], driver); + result = set_risdata_field(ptr_risdata, "endpage", &token[6], conn); if (result) { sprintf(sql_command, "233:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); @@ -997,5 +997,5 @@ } - result = set_risdata_field(ptr_risdata, "title", &token[6], driver); + result = set_risdata_field(ptr_risdata, "title", &token[6], conn); if (result == 1) { @@ -1032,5 +1032,5 @@ /* escape any characters that the database server cannot digest */ - if (dbi_driver_quote_string(driver, &(perinfo.full)) == -1) { + if (dbi_conn_quote_string(conn, &(perinfo.full)) == 0) { sprintf(sql_command, "801:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); if ((new_msgpool = mstrcat(*ptr_msg_pool, sql_command, ptr_msg_pool_len, 0)) == NULL) { @@ -1061,5 +1061,5 @@ } - if (dbi_driver_quote_string(driver, &(perinfo.custabbrev1)) == -1) { + if (dbi_conn_quote_string(conn, &(perinfo.custabbrev1)) == 0) { sprintf(sql_command, "801:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); if ((new_msgpool = mstrcat(*ptr_msg_pool, sql_command, ptr_msg_pool_len, 0)) == NULL) { @@ -1090,5 +1090,5 @@ } - if (dbi_driver_quote_string(driver, &(perinfo.custabbrev2)) == -1) { + if (dbi_conn_quote_string(conn, &(perinfo.custabbrev2)) == 0) { sprintf(sql_command, "801:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); if ((new_msgpool = mstrcat(*ptr_msg_pool, sql_command, ptr_msg_pool_len, 0)) == NULL) { @@ -1123,5 +1123,5 @@ dotify_journal(perinfo.abbrev, conn, conn_refdb); - if (dbi_driver_quote_string(driver, &(perinfo.abbrev)) == -1) { + if (dbi_conn_quote_string(conn, &(perinfo.abbrev)) == 0) { sprintf(sql_command, "801:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); if ((new_msgpool = mstrcat(*ptr_msg_pool, sql_command, ptr_msg_pool_len, 0)) == NULL) { @@ -1140,5 +1140,5 @@ else if (strncmp("VL - ", token, 6) == 0) { /* volume number */ - result = set_risdata_field(ptr_risdata, "volume", &token[6], driver); + result = set_risdata_field(ptr_risdata, "volume", &token[6], conn); if (result) { sprintf(sql_command, "233:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); @@ -1159,5 +1159,5 @@ else if (strncmp("BT - ", token, 6) == 0 || strncmp("T2 - ", token, 6) == 0) { /* book title */ - result = set_risdata_field(ptr_risdata, "booktitle", &token[6], driver); + result = set_risdata_field(ptr_risdata, "booktitle", &token[6], conn); if (result) { sprintf(sql_command, "233:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); @@ -1178,5 +1178,5 @@ else if (strncmp("T3 - ", token, 6) == 0) { /* title series */ - result = set_risdata_field(ptr_risdata, "title_series", &token[6], driver); + result = set_risdata_field(ptr_risdata, "title_series", &token[6], conn); if (result) { sprintf(sql_command, "233:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); @@ -1197,5 +1197,5 @@ else if (strncmp("CY - ", token, 6) == 0) { /* city of publication */ - result = set_risdata_field(ptr_risdata, "city", &token[6], driver); + result = set_risdata_field(ptr_risdata, "city", &token[6], conn); if (result) { sprintf(sql_command, "233:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); @@ -1216,5 +1216,5 @@ else if (strncmp("PB - ", token, 6) == 0) { /* publisher */ - result = set_risdata_field(ptr_risdata, "publisher", &token[6], driver); + result = set_risdata_field(ptr_risdata, "publisher", &token[6], conn); if (result) { sprintf(sql_command, "233:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); @@ -1239,5 +1239,5 @@ not part of the RIS spec as of RefMan 8.01. However, Endnote seems to use it for edition or something */ - result = set_risdata_field(ptr_risdata, "issue", &token[6], driver); + result = set_risdata_field(ptr_risdata, "issue", &token[6], conn); if (result) { sprintf(sql_command, "233:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); @@ -1258,5 +1258,5 @@ else if (strncmp("N2 - ", token, 6) == 0) { /* abstract */ - result = set_risdata_field(ptr_risdata, "abstract", &token[6], driver); + result = set_risdata_field(ptr_risdata, "abstract", &token[6], conn); if (result) { sprintf(sql_command, "233:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); @@ -1277,5 +1277,5 @@ else if (strncmp("SN - ", token, 6) == 0) { /* ISBN/ISSN */ - result = set_risdata_field(ptr_risdata, "issn", &token[6], driver); + result = set_risdata_field(ptr_risdata, "issn", &token[6], conn); if (result == 1) { sprintf(sql_command, "233:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); @@ -1296,5 +1296,5 @@ else if (strncmp("AD - ", token, 6) == 0) { /* address */ - result = set_risdata_field(ptr_risdata, "address", &token[6], driver); + result = set_risdata_field(ptr_risdata, "address", &token[6], conn); if (result) { sprintf(sql_command, "233:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); @@ -1315,5 +1315,5 @@ else if (strncmp("UR - ", token, 6) == 0) { /* URL */ - result = set_risdata_field(ptr_risdata, "url", &token[6], driver); + result = set_risdata_field(ptr_risdata, "url", &token[6], conn); if (result) { sprintf(sql_command, "233:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); @@ -1361,5 +1361,5 @@ /* user definable fields */ - result = set_risdata_field(ptr_risdata, tofield, &token[6], driver); + result = set_risdata_field(ptr_risdata, tofield, &token[6], conn); if (result) { sprintf(sql_command, "233:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); @@ -1395,5 +1395,5 @@ /* link fields */ - result = set_risdata_field(ptr_risdata, tofield, &token[6], driver); + result = set_risdata_field(ptr_risdata, tofield, &token[6], conn); if (result == 1) { sprintf(sql_command, "233:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); @@ -1418,5 +1418,5 @@ strcpy(real_citekey, &token[6]); preprocess_citekey(real_citekey); - result = set_risdata_field(ptr_risdata, "citekey", real_citekey, driver); + result = set_risdata_field(ptr_risdata, "citekey", real_citekey, conn); if (result) { sprintf(sql_command, "233:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset)); @@ -1510,5 +1510,5 @@ citekey = get_unique_citekey(conn, first_author, year, n_refdb_id, 0 /* refs */); - if (citekey && set_risdata_field(ptr_risdata, "citekey", citekey, driver) != 0) { + if (citekey && set_risdata_field(ptr_risdata, "citekey", citekey, conn) != 0) { if (citekey) { free((char*)citekey); @@ -2293,5 +2293,5 @@ /* escape any characters that the database server cannot digest */ - if (dbi_driver_quote_string(driver, &escape_buffer) == -1) { + if (dbi_conn_quote_string(conn, &escape_buffer) == 0) { LOG_PRINT(LOG_WARNING, "out of memory"); return 1; @@ -2396,5 +2396,5 @@ /* escape any characters that the database server cannot digest */ - if (dbi_driver_quote_string(driver, &escape_buffer) == -1) { + if (dbi_conn_quote_string(conn, &escape_buffer) == 0) { LOG_PRINT(LOG_WARNING, "out of memory"); free(sql_command); @@ -2458,5 +2458,5 @@ /* escape any characters that the database server cannot digest */ - if (dbi_driver_quote_string(driver, &another_escape_buffer) == -1) { + if (dbi_conn_quote_string(conn, &another_escape_buffer) == 0) { LOG_PRINT(LOG_WARNING, "out of memory"); free(sql_command); @@ -2513,5 +2513,5 @@ /* escape any characters that the database server cannot digest */ - if (dbi_driver_quote_string(driver, &another_escape_buffer) == -1) { + if (dbi_conn_quote_string(conn, &another_escape_buffer) == 0) { LOG_PRINT(LOG_WARNING, "out of memory"); free(sql_command); @@ -2568,5 +2568,5 @@ /* escape any characters that the database server cannot digest */ - if (dbi_driver_quote_string(driver, &another_escape_buffer) == -1) { + if (dbi_conn_quote_string(conn, &another_escape_buffer) == 0) { LOG_PRINT(LOG_WARNING, "out of memory"); free(sql_command); @@ -2623,5 +2623,5 @@ /* escape any characters that the database server cannot digest */ - if (dbi_driver_quote_string(driver, &another_escape_buffer) == -1) { + if (dbi_conn_quote_string(conn, &another_escape_buffer) == 0) { LOG_PRINT(LOG_WARNING, "out of memory"); free(sql_command); @@ -2701,5 +2701,5 @@ /* escape any characters that the database server cannot digest */ - if (dbi_driver_quote_string(driver, &escape_buffer) == -1) { + if (dbi_conn_quote_string(conn, &escape_buffer) == 0) { LOG_PRINT(LOG_WARNING, "out of memory"); free(sql_command); @@ -2801,5 +2801,5 @@ /* escape any characters that the database server cannot digest */ - if (dbi_driver_quote_string(driver, &escape_buffer) == -1) { + if (dbi_conn_quote_string(conn, &escape_buffer) == 0) { LOG_PRINT(LOG_WARNING, "out of memory"); free(sql_command); @@ -2887,5 +2887,5 @@ /* escape any characters that the database server cannot digest */ - if (dbi_driver_quote_string(driver, &escape_buffer) == -1) { + if (dbi_conn_quote_string(conn, &escape_buffer) == 0) { LOG_PRINT(LOG_WARNING, "out of memory"); return 1; Index: risxhandler.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/risxhandler.c,v retrieving revision 1.28.2.8 retrieving revision 1.28.2.9 diff -u -U2 -r1.28.2.8 -r1.28.2.9 --- risxhandler.c 31 May 2005 17:59:20 -0000 1.28.2.8 +++ risxhandler.c 26 Jul 2005 20:22:04 -0000 1.28.2.9 @@ -441,5 +441,5 @@ if (ptr_ardata->real_citekey && *ptr_ardata->real_citekey) { - result = set_risdata_field(ptr_ardata->ptr_risdata, "citekey", ptr_ardata->real_citekey, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, "citekey", ptr_ardata->real_citekey, ptr_ardata->conn); if (result == 1) { if ((new_msgpool = mstrcat(ptr_ardata->msgpool, outomem_n.text, &(ptr_ardata->msgpool_len), 0)) == NULL) { @@ -450,5 +450,5 @@ } if (type && *type) { - result = set_risdata_field(ptr_ardata->ptr_risdata, "type", type, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, "type", type, ptr_ardata->conn); if (result == 1) { if ((new_msgpool = mstrcat(ptr_ardata->msgpool, outomem_n.text, &(ptr_ardata->msgpool_len), 0)) == NULL) { @@ -725,5 +725,5 @@ if (is_descendant_of(ptr_ardata->ptr_first, "part")) { /* e.g. article, chapter titles */ - result = set_risdata_field(ptr_ardata->ptr_risdata, "title", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, "title", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->conn); } else if (is_descendant_of(ptr_ardata->ptr_first, "publication")) { @@ -737,5 +737,5 @@ || !strcmp(ptr_ardata->type, "CONF") || !strcmp(ptr_ardata->type, "BOOK")) { - result = set_risdata_field(ptr_ardata->ptr_risdata, "booktitle", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, "booktitle", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->conn); } else if (!strcmp(ptr_ardata->type, "JOUR") @@ -748,5 +748,5 @@ || !strcmp(ptr_ardata->type, "NEWS") || !strcmp(ptr_ardata->type, "GEN")) { - if (((ptr_ardata->perinfo).full = strdup((ptr_ardata->ptr_first)->ptr_elvalue)) == NULL || dbi_driver_quote_string(ptr_ardata->driver, &((ptr_ardata->perinfo).full)) == -1) { + if (((ptr_ardata->perinfo).full = strdup((ptr_ardata->ptr_first)->ptr_elvalue)) == NULL || dbi_conn_quote_string(ptr_ardata->conn, &((ptr_ardata->perinfo).full)) == 0) { if ((new_msgpool = mstrcat(ptr_ardata->msgpool, outomem_n.text, &(ptr_ardata->msgpool_len), 0)) == NULL) { (ptr_ardata->nmem_error)++; @@ -761,10 +761,10 @@ } else { - result = set_risdata_field(ptr_ardata->ptr_risdata, "title", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, "title", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->conn); } } else if (title_type && !strcmp(title_type, "abbrev")) { /* abbreviated journal title */ - if (((ptr_ardata->perinfo).abbrev = strdup((ptr_ardata->ptr_first)->ptr_elvalue)) == NULL || dbi_driver_quote_string(ptr_ardata->driver, &((ptr_ardata->perinfo).abbrev)) == -1) { + if (((ptr_ardata->perinfo).abbrev = strdup((ptr_ardata->ptr_first)->ptr_elvalue)) == NULL || dbi_conn_quote_string(ptr_ardata->conn, &((ptr_ardata->perinfo).abbrev)) == 0) { if ((new_msgpool = mstrcat(ptr_ardata->msgpool, outomem_n.text, &(ptr_ardata->msgpool_len), 0)) == NULL) { (ptr_ardata->nmem_error)++; @@ -780,5 +780,5 @@ else if (title_type && !strcmp(title_type, "user1")) { /* user abbrev1 of a journal title */ - if (((ptr_ardata->perinfo).custabbrev1 = strdup((ptr_ardata->ptr_first)->ptr_elvalue)) == NULL || dbi_driver_quote_string(ptr_ardata->driver, &((ptr_ardata->perinfo).custabbrev1)) == -1) { + if (((ptr_ardata->perinfo).custabbrev1 = strdup((ptr_ardata->ptr_first)->ptr_elvalue)) == NULL || dbi_conn_quote_string(ptr_ardata->conn, &((ptr_ardata->perinfo).custabbrev1)) == 0) { if ((new_msgpool = mstrcat(ptr_ardata->msgpool, outomem_n.text, &(ptr_ardata->msgpool_len), 0)) == NULL) { (ptr_ardata->nmem_error)++; @@ -794,5 +794,5 @@ else if (title_type && !strcmp(title_type, "user2")) { /* user abbrev1 of a journal title */ - if (((ptr_ardata->perinfo).custabbrev2 = strdup((ptr_ardata->ptr_first)->ptr_elvalue)) == NULL || dbi_driver_quote_string(ptr_ardata->driver, &((ptr_ardata->perinfo).custabbrev2)) == -1) { + if (((ptr_ardata->perinfo).custabbrev2 = strdup((ptr_ardata->ptr_first)->ptr_elvalue)) == NULL || dbi_conn_quote_string(ptr_ardata->conn, &((ptr_ardata->perinfo).custabbrev2)) == 0) { if ((new_msgpool = mstrcat(ptr_ardata->msgpool, outomem_n.text, &(ptr_ardata->msgpool_len), 0)) == NULL) { (ptr_ardata->nmem_error)++; @@ -815,5 +815,5 @@ } else { /* set */ - result = set_risdata_field(ptr_ardata->ptr_risdata, "title_series", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, "title_series", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->conn); } @@ -1088,5 +1088,5 @@ /* ------------------------------------------------------------ */ else if (!strcmp(el, "volume") && ptr_ardata->replace_ref != 2) { - result = set_risdata_field(ptr_ardata->ptr_risdata, "volume", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, "volume", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->conn); if (result == 1) { LOG_PRINT(LOG_WARNING, outomem.text); @@ -1105,5 +1105,5 @@ /* ------------------------------------------------------------ */ else if (!strcmp(el, "issue") && ptr_ardata->replace_ref != 2) { - result = set_risdata_field(ptr_ardata->ptr_risdata, "issue", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, "issue", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->conn); if (result == 1) { LOG_PRINT(LOG_WARNING, outomem.text); @@ -1122,5 +1122,5 @@ /* ------------------------------------------------------------ */ else if (!strcmp(el, "startpage") && ptr_ardata->replace_ref != 2) { - result = set_risdata_field(ptr_ardata->ptr_risdata, "startpage", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, "startpage", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->conn); if (result == 1) { LOG_PRINT(LOG_WARNING, outomem.text); @@ -1139,5 +1139,5 @@ /* ------------------------------------------------------------ */ else if (!strcmp(el, "endpage") && ptr_ardata->replace_ref != 2) { - result = set_risdata_field(ptr_ardata->ptr_risdata, "endpage", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, "endpage", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->conn); if (result == 1) { LOG_PRINT(LOG_WARNING, outomem.text); @@ -1156,5 +1156,5 @@ /* ------------------------------------------------------------ */ else if (!strcmp(el, "city") && ptr_ardata->replace_ref != 2) { - result = set_risdata_field(ptr_ardata->ptr_risdata, "city", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, "city", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->conn); if (result == 1) { LOG_PRINT(LOG_WARNING, outomem.text); @@ -1173,5 +1173,5 @@ /* ------------------------------------------------------------ */ else if (!strcmp(el, "publisher") && ptr_ardata->replace_ref != 2) { - result = set_risdata_field(ptr_ardata->ptr_risdata, "publisher", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, "publisher", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->conn); if (result == 1) { LOG_PRINT(LOG_WARNING, outomem.text); @@ -1190,5 +1190,5 @@ /* ------------------------------------------------------------ */ else if (!strcmp(el, "serial") && ptr_ardata->replace_ref != 2) { - result = set_risdata_field(ptr_ardata->ptr_risdata, "issn", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, "issn", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->conn); if (result == 1) { LOG_PRINT(LOG_WARNING, outomem.text); @@ -1207,5 +1207,5 @@ /* ------------------------------------------------------------ */ else if (!strcmp(el, "address") && ptr_ardata->replace_ref != 2) { - result = set_risdata_field(ptr_ardata->ptr_risdata, "address", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, "address", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->conn); if (result == 1) { LOG_PRINT(LOG_WARNING, outomem.text); @@ -1224,5 +1224,5 @@ /* ------------------------------------------------------------ */ else if (!strcmp(el, "url") && ptr_ardata->replace_ref != 2) { - result = set_risdata_field(ptr_ardata->ptr_risdata, "url", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, "url", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->conn); if (result == 1) { LOG_PRINT(LOG_WARNING, outomem.text); @@ -1263,5 +1263,5 @@ } - result = set_risdata_field(ptr_ardata->ptr_risdata, tofield, (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, tofield, (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->conn); if (result == 1) { LOG_PRINT(LOG_WARNING, outomem.text); @@ -1297,5 +1297,5 @@ } - result = set_risdata_field(ptr_ardata->ptr_risdata, tofield, (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, tofield, (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->conn); if (result == 1) { LOG_PRINT(LOG_WARNING, outomem.text); @@ -1334,5 +1334,5 @@ } - result = set_risdata_field(ptr_ardata->ptr_risdata, tofield, (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, tofield, (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->conn); if (result == 1) { LOG_PRINT(LOG_WARNING, outomem.text); @@ -1468,5 +1468,5 @@ /* ------------------------------------------------------------ */ else if (!strcmp(el, "abstract") && ptr_ardata->replace_ref != 2) { - result = set_risdata_field(ptr_ardata->ptr_risdata, "abstract", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver); + result = set_risdata_field(ptr_ardata->ptr_risdata, "abstract", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->conn); if (result == 1) { @@ -1689,5 +1689,5 @@ citekey = get_unique_citekey(ptr_ardata->conn, ptr_ardata->first_author, atoi(ptr_ardata->ck_year), ptr_ardata->n_refdb_id, 0 /* ref */); - if (citekey && set_risdata_field(ptr_ardata->ptr_risdata, "citekey", citekey, ptr_ardata->driver) != 0) { + if (citekey && set_risdata_field(ptr_ardata->ptr_risdata, "citekey", citekey, ptr_ardata->conn) != 0) { if (citekey) { free((char*)citekey); Index: xmlhandler.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/xmlhandler.c,v retrieving revision 1.22.2.15 retrieving revision 1.22.2.16 diff -u -U2 -r1.22.2.15 -r1.22.2.16 --- xmlhandler.c 6 May 2005 23:45:02 -0000 1.22.2.15 +++ xmlhandler.c 26 Jul 2005 20:22:04 -0000 1.22.2.16 @@ -513,5 +513,5 @@ } else { - if (dbi_driver_quote_string(dbi_conn_get_driver(ptr_asdata->conn), &the_journal_q) == -1) { + if (dbi_conn_quote_string(ptr_asdata->conn, &the_journal_q) == 0) { (*(ptr_asdata->ptr_nmem_error))++; LOG_PRINT(LOG_CRIT, get_status_msg(801)); @@ -877,5 +877,5 @@ } else { - if (dbi_driver_quote_string(dbi_conn_get_driver(ptr_asdata->conn), &elvalue_q) == -1) { + if (dbi_conn_quote_string(ptr_asdata->conn, &elvalue_q) == 0) { /* todo: bail out */ } @@ -1536,8 +1536,8 @@ /* the quote_string function checks for non-NULL arguments */ - dbi_driver_quote_string(driver, &my_refdb_title); - dbi_driver_quote_string(driver, &my_refdb_volume); - dbi_driver_quote_string(driver, &my_refdb_issue); - dbi_driver_quote_string(driver, &my_refdb_startpage); + dbi_conn_quote_string(ptr_gbdata->conn, &my_refdb_title); + dbi_conn_quote_string(ptr_gbdata->conn, &my_refdb_volume); + dbi_conn_quote_string(ptr_gbdata->conn, &my_refdb_issue); + dbi_conn_quote_string(ptr_gbdata->conn, &my_refdb_startpage); sprintf(sql_command, "INSERT INTO %s (article_title,volume,issue,startpage,pubyear) VALUES (%s,%s,%s,%s,%d)", ptr_gbdata->ptr_table_name, (my_refdb_title) ? my_refdb_title : "\'\'", (my_refdb_volume) ? my_refdb_volume : "\'\'", (my_refdb_issue) ? my_refdb_issue : "\'\'", (my_refdb_startpage) ? my_refdb_startpage : "\'\'", dbi_result_get_short(dbires, "refdb_pubyear")); @@ -1601,5 +1601,5 @@ author_q = strdup(query_result); - if (!author_q || dbi_driver_quote_string(driver, &author_q) == -1) { + if (!author_q || dbi_conn_quote_string(ptr_gbdata->conn, &author_q) == 0) { LOG_PRINT(LOG_WARNING, "out of memory"); (*(ptr_gbdata->ptr_nmem_error))++; |
