[Refdb-cvs] CVS: refdb/src refdbdbib.c,1.36.2.28,1.36.2.29
Status: Beta
Brought to you by:
mhoenicka
Menu
▾
▴
[Refdb-cvs] CVS: refdb/src refdbdbib.c,1.36.2.28,1.36.2.29
|
From: Markus H. <mho...@us...> - 2005-12-17 01:34:18
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26162 Modified Files: Tag: Release_0_9_5_stable refdbdbib.c Log Message: mset fixes Index: refdbdbib.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbdbib.c,v retrieving revision 1.36.2.28 retrieving revision 1.36.2.29 diff -u -U2 -r1.36.2.28 -r1.36.2.29 --- refdbdbib.c 3 Nov 2005 20:40:19 -0000 1.36.2.28 +++ refdbdbib.c 17 Dec 2005 01:34:09 -0000 1.36.2.29 @@ -59,5 +59,5 @@ static int append_return_msg(struct ADDRESULT *ptr_addresult, int n_status, const char* entry_id, dbi_conn conn); static int sort_entries_asis(dbi_conn conn, struct CLIENT_REQUEST* ptr_clrequest, struct ADDRESULT* ptr_addresult, const char* table_name); -static int fill_in_authoryear_info(struct BIBCONNS* ptr_bibconns, dbi_result dbires, dbi_result dbires_cit, struct CLIENT_REQUEST* ptr_clrequest, struct ADDRESULT* ptr_addresult, struct bibinfo* biblio_info, const char* table_name, char* pubtype, char* current_mset, unsigned long long* nref_counter); +static int fill_in_authoryear_info(struct BIBCONNS* ptr_bibconns, dbi_result dbires, dbi_result dbires_cit, struct CLIENT_REQUEST* ptr_clrequest, struct ADDRESULT* ptr_addresult, struct bibinfo* biblio_info, const char* table_name, char* pubtype, struct mset* ptr_mset_sentinel, unsigned long long* nref_counter); static void close_dbi_connections(struct BIBCONNS* ptr_bibconns, const char* drivername); static int write_bibstyle_info(int fd, const char* bibliofirstindent, const char* biblioblockindent, const char* fontsize, int type); @@ -131,5 +131,4 @@ char sql_command1[512]; char intext_string[8] = "INTEXTS"; - char current_mset[10] = ""; char table_name[] = "getbibtemp"; char *curr_multi_id = NULL; @@ -676,5 +675,5 @@ if (!nis_numeric) { /* only useful for author/year style */ - if ((n_status = fill_in_authoryear_info(&bibconns, dbires, dbires_cit, ptr_clrequest, ptr_addresult, ptr_biblio_info, table_name, intext_string, current_mset, &nref_counter)) != 0) { + if ((n_status = fill_in_authoryear_info(&bibconns, dbires, dbires_cit, ptr_clrequest, ptr_addresult, ptr_biblio_info, table_name, intext_string, NULL /* don't need bibliomsets */, &nref_counter)) != 0) { send_status(ptr_clrequest->fd, n_status, TERM_NO); dbi_result_free(dbires_cit); @@ -1201,8 +1200,10 @@ temporary table to query + struct mset* ptr_mset_sentinel ptr to bibliomset relation argument stack + unsigned long long* nref_counter ptr to a reference counter ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -static int fill_in_authoryear_info(struct BIBCONNS* ptr_bibconns, dbi_result dbires, dbi_result dbires_cit, struct CLIENT_REQUEST* ptr_clrequest, struct ADDRESULT* ptr_addresult, struct bibinfo* biblio_info, const char* table_name, char* pubtype, char* current_mset, unsigned long long* nref_counter) { +static int fill_in_authoryear_info(struct BIBCONNS* ptr_bibconns, dbi_result dbires, dbi_result dbires_cit, struct CLIENT_REQUEST* ptr_clrequest, struct ADDRESULT* ptr_addresult, struct bibinfo* biblio_info, const char* table_name, char* pubtype, struct mset* ptr_mset_sentinel, unsigned long long* nref_counter) { int n_pubyear; int unique_count; @@ -1293,5 +1294,5 @@ title_as_author = dbi_result_get_short(dbires, "title_as_author"); - 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, title_as_author)) != 0) { + if ((n_status = format_entry(&authorlist_buffer, &authorlist_buffer_len, pubtype, ptr_bibconns, dbires_cit, NULL /* authorlist only */, item, ptr_clrequest->username, 0, ptr_mset_sentinel, biblio_info, title_as_author)) != 0) { append_return_msg(ptr_addresult, n_status, NULL, ptr_bibconns->conn); free(id_string); |
