[Refdb-cvs] CVS: refdb/src backend-bibtex.c,1.16.2.6,1.16.2.7 backend-db31.c,1.16.2.5,1.16.2.6 backe
Status: Beta
Brought to you by:
mhoenicka
Menu
▾
▴
[Refdb-cvs] CVS: refdb/src backend-bibtex.c,1.16.2.6,1.16.2.7 backend-db31.c,1.16.2.5,1.16.2.6 backend-dbib.c,1.28.2.11,1.28.2.12 backend-dbiba.c,1.26.2.15,1.26.2.16 backend-html.c,1.27.2.6,1.27.2.7 backend-ris.c,1.14.2.5,1.14.2.6 backend-risx.c,1.30.2.11,1.30.2.12 backend-scrn.c,1.17.2.5,1.17.2.6 backend-teix.c,1.7.2.3,1.7.2.4 backend.c,1.27.2.12,1.27.2.13 backendn-html.c,1.6.2.4,1.6.2.5 backendn-notex.c,1.8.2.5,1.8.2.6 backendn-scrn.c,1.3.2.3,1.3.2.4 noteshandler.c,1.18.2.11,1.18.2.12 refdb.h,1.14.2.1,1.14.2.2 refdbd.c,1.74.2.19,1.74.2.20 refdbda.c,1.41.2.20,1.41.2.21 refdbdbib.c,1.36.2.27,1.36.2.28 refdbdnote.c,1.25.2.14,1.25.2.15 refdbdref.c,1.65.2.22,1.65.2.23 refdbib.c,1.41.2.5,1.41.2.6 risdb.c,1.44.2.12,1.44.2.13 risxhandler.c,1.28.2.13,1.28.2.14 xmlhandler.c,1.22.2.20,1.22.2.21 xmlhelper.c,1.2.2.1,1.2.2.2 xmlout.c,1.6.2.5,1.6.2.6
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13883 Modified Files: Tag: Release_0_9_5_stable backend-bibtex.c backend-db31.c backend-dbib.c backend-dbiba.c backend-html.c backend-ris.c backend-risx.c backend-scrn.c backend-teix.c backend.c backendn-html.c backendn-notex.c backendn-scrn.c noteshandler.c refdb.h refdbd.c refdbda.c refdbdbib.c refdbdnote.c refdbdref.c refdbib.c risdb.c risxhandler.c xmlhandler.c xmlhelper.c xmlout.c Log Message: removed BSTRING, replaced all occurrences with get_status_msg() calls Index: backend-bibtex.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-bibtex.c,v retrieving revision 1.16.2.6 retrieving revision 1.16.2.7 diff -u -U2 -r1.16.2.6 -r1.16.2.7 --- backend-bibtex.c 11 Sep 2005 19:55:11 -0000 1.16.2.6 +++ backend-bibtex.c 3 Nov 2005 20:40:19 -0000 1.16.2.7 @@ -37,12 +37,4 @@ /* some globals */ -extern struct BSTRING outomem; -extern struct BSTRING outomem_n; -extern struct BSTRING connerr; -extern struct BSTRING connerr_n; -extern struct BSTRING positive; -extern struct BSTRING negative; - -/* extern char server_ip[]; */ /* the IP address of the database server */ extern int n_log_level; /* numeric version of log_level */ Index: backend-db31.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-db31.c,v retrieving revision 1.16.2.5 retrieving revision 1.16.2.6 diff -u -U2 -r1.16.2.5 -r1.16.2.6 --- backend-db31.c 8 Aug 2005 00:09:20 -0000 1.16.2.5 +++ backend-db31.c 3 Nov 2005 20:40:19 -0000 1.16.2.6 @@ -35,5 +35,4 @@ /* some globals */ -extern struct BSTRING outomem; extern int n_log_level; /* numeric version of log_level */ Index: backend-dbib.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-dbib.c,v retrieving revision 1.28.2.11 retrieving revision 1.28.2.12 diff -u -U2 -r1.28.2.11 -r1.28.2.12 --- backend-dbib.c 2 Oct 2005 23:38:14 -0000 1.28.2.11 +++ backend-dbib.c 3 Nov 2005 20:40:19 -0000 1.28.2.12 @@ -40,6 +40,4 @@ extern int n_log_level; extern dbi_result dbi_style_res; -extern struct BSTRING outomem; -extern struct BSTRING connerr; /* forward declarations of local functions */ Index: backend-dbiba.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-dbiba.c,v retrieving revision 1.26.2.15 retrieving revision 1.26.2.16 diff -u -U2 -r1.26.2.15 -r1.26.2.16 --- backend-dbiba.c 2 Oct 2005 23:38:15 -0000 1.26.2.15 +++ backend-dbiba.c 3 Nov 2005 20:40:19 -0000 1.26.2.16 @@ -41,5 +41,4 @@ extern int n_log_level; -extern struct BSTRING outomem; /* forward declarations of local functions */ @@ -1090,5 +1089,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* preceeding */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); return NULL; @@ -1096,5 +1095,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -1108,5 +1107,5 @@ if ((new_ref = mstrcat(*ptr_ref, starttag, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -1119,5 +1118,5 @@ if (item_dateother && *item_dateother && !dbi_conn_error_flag(ptr_bibconns->conn_source)) { if (sgml_entitize(&item_dateother, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_dateother); return NULL; @@ -1168,5 +1167,5 @@ if (item_firstsep && *item_firstsep && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { if (sgml_entitize(&item_firstsep, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_firstsep); return NULL; @@ -1187,5 +1186,5 @@ if (item_secondsep && *item_secondsep && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { if (sgml_entitize(&item_secondsep, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_secondsep); return NULL; @@ -1219,5 +1218,5 @@ all we "have", the whole element should be omitted */ if ((new_ref = mstrcat(*ptr_ref, dummy_year, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1243,5 +1242,5 @@ if (item_firstsep && *item_firstsep) { if ((new_ref = mstrcat(*ptr_ref, item_firstsep, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1266,5 +1265,5 @@ /* insert dummy pubdate */ if ((new_ref = mstrcat(*ptr_ref, dummy_year, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1290,5 +1289,5 @@ if (item_firstsep && *item_firstsep) { if ((new_ref = mstrcat(*ptr_ref, item_firstsep, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1312,5 +1311,5 @@ if (item_secondsep && *item_secondsep) { if ((new_ref = mstrcat(*ptr_ref, item_secondsep, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1333,5 +1332,5 @@ /* insert dummy pubdate */ if ((new_ref = mstrcat(*ptr_ref, dummy_year, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1358,5 +1357,5 @@ if (item_firstsep && *item_firstsep) { if ((new_ref = mstrcat(*ptr_ref, item_firstsep, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1380,5 +1379,5 @@ if (item_secondsep && *item_secondsep) { if ((new_ref = mstrcat(*ptr_ref, item_secondsep, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1401,5 +1400,5 @@ /* insert dummy pubdate */ if ((new_ref = mstrcat(*ptr_ref, dummy_year, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1423,5 +1422,5 @@ /* insert dummy pubdate */ if ((new_ref = mstrcat(*ptr_ref, dummy_year, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1435,5 +1434,5 @@ if (item_firstsep && *item_firstsep) { if ((new_ref = mstrcat(*ptr_ref, item_firstsep, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1459,5 +1458,5 @@ if (item_secondsep && *item_secondsep) { if ((new_ref = mstrcat(*ptr_ref, item_secondsep, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1485,5 +1484,5 @@ sprintf(year_buffer, "%d", n_pubyear); if ((new_ref = mstrcat(*ptr_ref, year_buffer, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1496,5 +1495,5 @@ /* insert dummy pubdate */ if ((new_ref = mstrcat(*ptr_ref, dummy_year, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1508,5 +1507,5 @@ if ((new_ref = mstrcat(*ptr_ref, "</pubdate>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -1518,5 +1517,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* following */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); return NULL; @@ -1524,5 +1523,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); return NULL; @@ -1695,5 +1694,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* preceeding */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(real_item_title); @@ -1702,5 +1701,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(real_item_title); @@ -1718,5 +1717,5 @@ if (n_title_as_author) { if ((new_ref = mstrcat(*ptr_ref, "<title>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(real_item_title); return NULL; @@ -1728,5 +1727,5 @@ else { if ((new_ref = mstrcat(*ptr_ref, "<title role=\"", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(real_item_title); return NULL; @@ -1737,5 +1736,5 @@ if ((new_ref = mstrcat(*ptr_ref, role, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(real_item_title); return NULL; @@ -1746,5 +1745,5 @@ if ((new_ref = mstrcat(*ptr_ref, "\">", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(real_item_title); return NULL; @@ -1767,5 +1766,5 @@ if (sgml_entitize(&real_item_title, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(real_item_title); return NULL; @@ -1773,5 +1772,5 @@ if ((new_ref = mstrcat(*ptr_ref, real_item_title, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(real_item_title); return NULL; @@ -1785,5 +1784,5 @@ if ((new_ref = mstrcat(*ptr_ref, "</title>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -1795,5 +1794,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* following */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); return NULL; @@ -1884,5 +1883,5 @@ if (preceeding && *preceeding && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* preceeding */ if (sgml_entitize(&preceeding, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(preceeding); return NULL; @@ -1893,5 +1892,5 @@ if (following && *following && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* following */ if (sgml_entitize(&following, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(following); if (preceeding) { @@ -1916,5 +1915,5 @@ if (preceeding) { if ((new_ref = mstrcat(*ptr_ref, preceeding, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(preceeding); if (following) { @@ -2006,5 +2005,5 @@ if (following) { if ((new_ref = mstrcat(*ptr_ref, following, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(following); if (preceeding) { @@ -2149,5 +2148,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* preceeding */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); return NULL; @@ -2156,5 +2155,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { free(item); - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -2169,5 +2168,5 @@ if (n_intext != 3) { if ((new_ref = mstrcat(*ptr_ref, "<title>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -2180,5 +2179,5 @@ mod_periodical = malloc(strlen(periodical)+2); /* extra spaces */ if (!mod_periodical) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -2229,5 +2228,5 @@ if ((new_ref = mstrcat(*ptr_ref, mod_periodical, ptr_ref_len, 0)) == NULL) { free(mod_periodical); - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -2239,5 +2238,5 @@ if (n_intext != 3) { if ((new_ref = mstrcat(*ptr_ref, "</title>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -2250,5 +2249,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* following */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); return NULL; @@ -2256,5 +2255,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -2322,5 +2321,5 @@ if (sgml_entitize(&item_simple, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_simple); return NULL; @@ -2359,5 +2358,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* preceeding */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(item_simple); @@ -2366,5 +2365,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(item_simple); @@ -2380,5 +2379,5 @@ if ((new_ref = mstrcat(*ptr_ref, start_tag, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_simple); return NULL; @@ -2389,5 +2388,5 @@ if ((new_ref = mstrcat(*ptr_ref, item_simple, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_simple); return NULL; @@ -2398,5 +2397,5 @@ if ((new_ref = mstrcat(*ptr_ref, end_tag, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_simple); return NULL; @@ -2409,5 +2408,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* following */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(item_simple); @@ -2416,5 +2415,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(item_simple); @@ -2512,5 +2511,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* preceeding */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2519,5 +2518,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2539,5 +2538,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2546,5 +2545,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2560,5 +2559,5 @@ if ((new_ref = mstrcat(*ptr_ref, "<pagenums>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -2569,5 +2568,5 @@ if (sgml_entitize(&item_sp, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -2575,5 +2574,5 @@ if ((new_ref = mstrcat(*ptr_ref, item_sp, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -2584,5 +2583,5 @@ if ((new_ref = mstrcat(*ptr_ref, "</pagenums>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -2595,5 +2594,5 @@ if (item && *item & !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2602,5 +2601,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2620,5 +2619,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2627,5 +2626,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2641,5 +2640,5 @@ if ((new_ref = mstrcat(*ptr_ref, "<pagenums>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -2650,5 +2649,5 @@ if (sgml_entitize(&item_sp, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -2667,5 +2666,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2674,5 +2673,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2685,5 +2684,5 @@ else { if ((new_ref = mstrcat(*ptr_ref, "-", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -2706,5 +2705,5 @@ if ((new_ref = mstrcat(*ptr_ref, "</pagenums>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -2717,5 +2716,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2724,5 +2723,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2742,5 +2741,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* following */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2749,5 +2748,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2816,5 +2815,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* preceeding */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(item_notes); @@ -2823,5 +2822,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(item_notes); @@ -2837,5 +2836,5 @@ if ((new_ref = mstrcat(*ptr_ref, "<bibliomset role=\"notes\">", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_notes); return NULL; @@ -2846,5 +2845,5 @@ if (sgml_entitize(&item_notes, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_notes); return NULL; @@ -2852,5 +2851,5 @@ if ((new_ref = mstrcat(*ptr_ref, item_notes, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_notes); return NULL; @@ -2861,5 +2860,5 @@ if ((new_ref = mstrcat(*ptr_ref, "</bibliomset>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_notes); return NULL; @@ -2872,5 +2871,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* following */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(item_notes); @@ -2879,5 +2878,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(item_notes); @@ -2963,5 +2962,5 @@ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); dbi_result_free(dbires_sep); @@ -2969,5 +2968,5 @@ } if ((new_ref = mstrcat(ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); dbi_result_free(dbires_sep); free(item); @@ -3318,5 +3317,5 @@ if (strcmp(dayformat, "ARABICDAY") == 0) { if ((new_ref = mstrcat(ref, the_day, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -3327,5 +3326,5 @@ else if (strcmp(dayformat, "ROMANDAY") == 0) { if ((new_ref = mstrcat(ref, romanday[n_day-1], ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -3858,5 +3857,5 @@ if ((new_ref = mstrcat(*ptr_ref, tag, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -3866,10 +3865,10 @@ if ((entitize_buf = mstrdup(lastname)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } if (sgml_entitize(&entitize_buf, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(entitize_buf); return NULL; @@ -3877,5 +3876,5 @@ if ((new_ref = mstrcat(*ptr_ref, entitize_buf, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(entitize_buf); return NULL; @@ -3887,5 +3886,5 @@ if ((new_ref = mstrcat(*ptr_ref, "</surname>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -3940,5 +3939,5 @@ if ((new_ref = mstrcat(*ptr_ref, tag, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -3948,5 +3947,5 @@ if ((entitize_buf = mstrdup(ptr_ainfo->firstname)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -3963,5 +3962,5 @@ if (sgml_entitize(&entitize_buf, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(entitize_buf); return NULL; @@ -3969,5 +3968,5 @@ if ((new_ref = mstrcat(*ptr_ref, entitize_buf, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(entitize_buf); return NULL; @@ -3981,5 +3980,5 @@ strcmp(initialstyle, "F.M.") == 0)) { if ((new_ref = mstrcat(*ptr_ref, ".", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -3990,5 +3989,5 @@ if ((new_ref = mstrcat(*ptr_ref, "</firstname>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -4007,5 +4006,5 @@ strcmp(initialstyle, "FSPCM") == 0)) { if ((new_ref = mstrcat(*ptr_ref, " ", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -4016,5 +4015,5 @@ if ((new_ref = mstrcat(*ptr_ref, "<othername>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -4024,5 +4023,5 @@ if ((entitize_buf = mstrdup(item)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -4044,5 +4043,5 @@ if (sgml_entitize(&entitize_buf, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(entitize_buf); return NULL; @@ -4050,5 +4049,5 @@ if ((new_ref = mstrcat(*ptr_ref, entitize_buf, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(entitize_buf); return NULL; @@ -4063,5 +4062,5 @@ strcmp(initialstyle, "FIRSTSPCM.") == 0)) { if ((new_ref = mstrcat(*ptr_ref, ".", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -4072,5 +4071,5 @@ if ((new_ref = mstrcat(*ptr_ref, "</othername>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } Index: backend-html.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-html.c,v retrieving revision 1.27.2.6 retrieving revision 1.27.2.7 diff -u -U2 -r1.27.2.6 -r1.27.2.7 --- backend-html.c 22 Sep 2005 21:40:08 -0000 1.27.2.6 +++ backend-html.c 3 Nov 2005 20:40:19 -0000 1.27.2.7 @@ -36,7 +36,4 @@ extern char refdblib[]; /* location of shareable files */ -extern struct BSTRING cgihead_html; -extern struct BSTRING cgihead_plain; -extern struct BSTRING outomem; extern int n_log_level; /* numeric version of log_level */ @@ -61,46 +58,15 @@ char* header; - n_cgi = (ptr_rendinfo->ref_format == REFCGIHTML) ? 1:0; - - /* write a header */ - if (n_cgi) { - html_head = load_html("refdbq_head", refdblib); - if (!html_head) { - LOG_PRINT(LOG_ERR, get_status_msg(802)); - return 802; - } - strcpy(*(ptr_rendinfo->ptr_ref), cgihead_html.text); - if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), html_head, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - free(html_head); - LOG_PRINT(LOG_CRIT, get_status_msg(801)); - return 801; - } - else { - *(ptr_rendinfo->ptr_ref) = new_ref; - } - free(html_head); - - if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "<thead><tr><th class=\"result\">Matching References</th></tr>\n<tr><td class=\"result\"><input type=\"submit\" value=\"Delete selected references\" name=\"deleteref\"> <input type=\"submit\" value=\"Add selected references to Personal List\" name=\"pickref\"> <input type=\"submit\" value=\"Remove selected references from Personal List\" name=\"unpickref\"></td></tr></thead><tbody>", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - free(html_head); - LOG_PRINT(LOG_CRIT, get_status_msg(801)); - return 801; - } - else { - *(ptr_rendinfo->ptr_ref) = new_ref; - } + if ((header = assemble_header(ptr_rendinfo)) == NULL) { + return 801; } - else { /* not cgi */ - if ((header = assemble_header(ptr_rendinfo)) == NULL) { - return 801; - } - if ((new_ref = mstrcpy(*(ptr_rendinfo->ptr_ref), header, ptr_rendinfo->ptr_ref_len)) == NULL) { - free(header); - return 801; - } - else { - *(ptr_rendinfo->ptr_ref) = new_ref; - free(header); - } + if ((new_ref = mstrcpy(*(ptr_rendinfo->ptr_ref), header, ptr_rendinfo->ptr_ref_len)) == NULL) { + free(header); + return 801; + } + else { + *(ptr_rendinfo->ptr_ref) = new_ref; + free(header); } Index: backend-ris.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-ris.c,v retrieving revision 1.14.2.5 retrieving revision 1.14.2.6 diff -u -U2 -r1.14.2.5 -r1.14.2.6 --- backend-ris.c 7 Sep 2005 23:45:01 -0000 1.14.2.5 +++ backend-ris.c 3 Nov 2005 20:40:19 -0000 1.14.2.6 @@ -34,12 +34,6 @@ #include "connect.h" -/* extern char username[]; */ /* the database username */ -/* extern char passwd[]; */ /* database password */ -/* extern char current_db[]; */ /* current database */ extern char refdblib[]; /* location of shareable files */ -extern struct BSTRING cgihead_html; -extern struct BSTRING cgihead_plain; -extern struct BSTRING outomem; extern int n_log_level; /* numeric version of log_level */ @@ -64,35 +58,7 @@ char cgi_buffer[1024]; - n_cgi = (ptr_rendinfo->ref_format == 7) ? 1:0; + /* we just make sure that we start with a clean string */ + (*(ptr_rendinfo->ptr_ref))[0] = '\0'; - if (n_cgi) { - html_head = load_html("refdbq_head", refdblib); - if (!html_head) { - return 802; - } - strcpy(*(ptr_rendinfo->ptr_ref), cgihead_html.text); - if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), html_head, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - free(html_head); - LOG_PRINT(LOG_CRIT, get_status_msg(801)); - return 801; - } - else { - *(ptr_rendinfo->ptr_ref) = new_ref; - } - free(html_head); - - if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "<thead><tr><th class=\"result\">Edit Reference</th></tr>\n<tr><td class=\"result\"><input type=\"submit\" value=\"Update\" name=\"updateref\"></td></tr></thead><tbody>", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - free(html_head); - LOG_PRINT(LOG_CRIT, get_status_msg(801)); - return 801; - } - else { - *(ptr_rendinfo->ptr_ref) = new_ref; - } - } - else { /* not cgi */ - /* we just make sure that we start with a clean string */ - (*(ptr_rendinfo->ptr_ref))[0] = '\0'; - } return 0; } @@ -358,5 +324,5 @@ && reprint.reprint != NULL && *(reprint.reprint)) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "\nRP - ", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -365,5 +331,5 @@ } if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), reprint.reprint, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -373,5 +339,5 @@ if (reprint.date != NULL && *(reprint.date)) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), " (", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -380,5 +346,5 @@ } if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), reprint.date, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -387,5 +353,5 @@ } if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), ")", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -398,5 +364,5 @@ if (reprint.avail != NULL && *(reprint.avail)) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "\nAV - ", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -405,5 +371,5 @@ } if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), reprint.avail, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -528,5 +494,5 @@ if (!have_pubyear && strcmp(item, "///")) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "\nPY - ", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -537,5 +503,5 @@ if (have_pubyear || strcmp(item, "///")) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), (char*)item, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -548,5 +514,5 @@ /* add /// to make the date entry valid */ if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "///", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -572,5 +538,5 @@ if (!have_pubyear && strcmp(item, "///")) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "\nY2 - ", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -581,5 +547,5 @@ if (have_pubyear || strcmp(item, "///")) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), (char*)item, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -592,5 +558,5 @@ /* add /// to make the date entry valid */ if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "///", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -675,5 +641,5 @@ /* The End */ if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "\nER - \n", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -684,5 +650,5 @@ if (n_cgi) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "</textarea></td></tr>", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } Index: backend-risx.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-risx.c,v retrieving revision 1.30.2.11 retrieving revision 1.30.2.12 diff -u -U2 -r1.30.2.11 -r1.30.2.12 --- backend-risx.c 23 Oct 2005 20:18:41 -0000 1.30.2.11 +++ backend-risx.c 3 Nov 2005 20:40:19 -0000 1.30.2.12 @@ -40,7 +40,4 @@ extern char refdblib[]; /* location of shareable files */ -extern struct BSTRING cgihead_html; -extern struct BSTRING cgihead_plain; -extern struct BSTRING outomem; extern int n_log_level; /* numeric version of log_level */ @@ -230,5 +227,5 @@ if (nhave_buffer_data) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), buffer, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(buffer); return 801; @@ -358,5 +355,5 @@ if (nhave_buffer_data) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), buffer, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(buffer); return 801; @@ -400,5 +397,5 @@ if (nhave_buffer_data) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), buffer, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(buffer); return 801; @@ -455,5 +452,5 @@ if (nhave_buffer_data) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), buffer, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(buffer); return 801; @@ -515,5 +512,5 @@ if (nhave_buffer_data) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), buffer, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(buffer); return 801; @@ -747,5 +744,5 @@ buffer1_len = 4096; if ((buffer1 = malloc(buffer1_len)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -976,5 +973,5 @@ *ptr_nhave_buffer_data = 1; if ((new_ref = mstrcat(*ptr_buffer, buffer1, ptr_buffer_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(buffer1); return NULL; @@ -1027,5 +1024,5 @@ buffer1_len = 4096; if ((buffer1 = malloc(buffer1_len)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -1151,5 +1148,5 @@ if (nhave_data) { if ((new_ref = mstrcat(*ptr_buffer, buffer1, ptr_buffer_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(buffer1); return NULL; Index: backend-scrn.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-scrn.c,v retrieving revision 1.17.2.5 retrieving revision 1.17.2.6 diff -u -U2 -r1.17.2.5 -r1.17.2.6 --- backend-scrn.c 22 Sep 2005 21:40:08 -0000 1.17.2.5 +++ backend-scrn.c 3 Nov 2005 20:40:19 -0000 1.17.2.6 @@ -39,5 +39,4 @@ /* some globals */ -extern struct BSTRING outomem; extern int n_log_level; /* numeric version of log_level */ Index: backend-teix.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-teix.c,v retrieving revision 1.7.2.3 retrieving revision 1.7.2.4 diff -u -U2 -r1.7.2.3 -r1.7.2.4 --- backend-teix.c 29 Jul 2005 21:15:34 -0000 1.7.2.3 +++ backend-teix.c 3 Nov 2005 20:40:19 -0000 1.7.2.4 @@ -34,5 +34,4 @@ /* some globals */ -extern struct BSTRING outomem; extern int n_log_level; /* numeric version of log_level */ Index: backend.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend.c,v retrieving revision 1.27.2.12 retrieving revision 1.27.2.13 diff -u -U2 -r1.27.2.12 -r1.27.2.13 --- backend.c 2 Oct 2005 23:38:16 -0000 1.27.2.12 +++ backend.c 3 Nov 2005 20:40:19 -0000 1.27.2.13 @@ -33,4 +33,5 @@ #include "risdb.h" #include "authorinfo.h" +#include "connect.h" /* globals */ @@ -38,5 +39,4 @@ extern int n_log_level; extern dbi_result dbi_style_res; -extern struct BSTRING outomem; /* this string array is used for author queries. MySQL uses an enum field, @@ -61,5 +61,5 @@ if ((header = malloc(header_len)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } Index: backendn-html.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backendn-html.c,v retrieving revision 1.6.2.4 retrieving revision 1.6.2.5 diff -u -U2 -r1.6.2.4 -r1.6.2.5 --- backendn-html.c 19 Sep 2005 20:10:29 -0000 1.6.2.4 +++ backendn-html.c 3 Nov 2005 20:40:19 -0000 1.6.2.5 @@ -32,5 +32,4 @@ /* some globals */ -extern struct BSTRING outomem; extern int n_log_level; /* numeric version of log_level */ @@ -80,5 +79,5 @@ if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "</body>\n</html>\n", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } Index: backendn-notex.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backendn-notex.c,v retrieving revision 1.8.2.5 retrieving revision 1.8.2.6 diff -u -U2 -r1.8.2.5 -r1.8.2.6 --- backendn-notex.c 23 Sep 2005 23:48:34 -0000 1.8.2.5 +++ backendn-notex.c 3 Nov 2005 20:40:19 -0000 1.8.2.6 @@ -37,5 +37,4 @@ /* some globals */ -extern struct BSTRING outomem; extern int n_log_level; /* numeric version of log_level */ @@ -333,5 +332,5 @@ /* finish with an empty line */ if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "\n\n", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } Index: backendn-scrn.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backendn-scrn.c,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -u -U2 -r1.3.2.3 -r1.3.2.4 --- backendn-scrn.c 19 Sep 2005 20:10:29 -0000 1.3.2.3 +++ backendn-scrn.c 3 Nov 2005 20:40:19 -0000 1.3.2.4 @@ -32,5 +32,4 @@ /* some globals */ -extern struct BSTRING outomem; extern int n_log_level; /* numeric version of log_level */ Index: noteshandler.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/noteshandler.c,v retrieving revision 1.18.2.11 retrieving revision 1.18.2.12 diff -u -U2 -r1.18.2.11 -r1.18.2.12 --- noteshandler.c 23 Sep 2005 23:49:44 -0000 1.18.2.11 +++ noteshandler.c 3 Nov 2005 20:40:19 -0000 1.18.2.12 @@ -41,10 +41,8 @@ #include "risdb.h" #include "dbfncs.h" +#include "connect.h" extern int n_log_level; extern int nongeek_offset; -extern struct BSTRING connerr; -extern struct BSTRING outomem; -extern struct BSTRING outomem_n; /* forward declaration of local functions */ @@ -477,5 +475,5 @@ /* sprintf(sql_command, "try to add set as note "ULLSPEC"\n", (unsigned long long)(ptr_andata->n_note_id)); */ /* if ((new_msgpool = mstrcat(ptr_andata->msgpool, sql_command, &(ptr_andata->msgpool_len), 0)) == NULL) { */ -/* LOG_PRINT(LOG_WARNING, outomem.text); */ +/* LOG_PRINT(LOG_WARNING, get_status_msg(801)); */ /* (ptr_andata->nmem_error)++; */ /* return; */ @@ -733,5 +731,5 @@ if ((my_elvalue = malloc(outlength)) == NULL) { - if ((new_msgpool = mstrcat(ptr_andata->msgpool, outomem_n.text, &(ptr_andata->msgpool_len), 0)) == NULL) { + if ((new_msgpool = mstrcat(ptr_andata->msgpool, (char*)get_status_msg(801), &(ptr_andata->msgpool_len), 0)) == NULL) { return; } @@ -794,5 +792,5 @@ if (result == 1) { - if ((new_msgpool = mstrcat(ptr_andata->msgpool, outomem_n.text, &(ptr_andata->msgpool_len), 0)) == NULL) { + if ((new_msgpool = mstrcat(ptr_andata->msgpool, (char*)get_status_msg(801), &(ptr_andata->msgpool_len), 0)) == NULL) { (ptr_andata->nmem_error)++; return; @@ -817,6 +815,6 @@ if (result == 1 /* out of memory */) { - LOG_PRINT(LOG_WARNING, outomem.text); - if ((new_msgpool = mstrcat(ptr_andata->msgpool, outomem_n.text, &(ptr_andata->msgpool_len), 0)) == NULL) { + LOG_PRINT(LOG_WARNING, get_status_msg(801)); + if ((new_msgpool = mstrcat(ptr_andata->msgpool, (char*)get_status_msg(801), &(ptr_andata->msgpool_len), 0)) == NULL) { (ptr_andata->nmem_error)++; return; @@ -922,6 +920,6 @@ if (result == 1) { - LOG_PRINT(LOG_WARNING, outomem.text); - if ((new_msgpool = mstrcat(ptr_andata->msgpool, outomem_n.text, &(ptr_andata->msgpool_len), 0)) == NULL) { + LOG_PRINT(LOG_WARNING, get_status_msg(801)); + if ((new_msgpool = mstrcat(ptr_andata->msgpool, (char*)get_status_msg(801), &(ptr_andata->msgpool_len), 0)) == NULL) { (ptr_andata->nmem_error)++; return; @@ -951,5 +949,5 @@ if (result == 1) { - if ((new_msgpool = mstrcat(ptr_andata->msgpool, outomem_n.text, &(ptr_andata->msgpool_len), 0)) == NULL) { + if ((new_msgpool = mstrcat(ptr_andata->msgpool, (char*)get_status_msg(801), &(ptr_andata->msgpool_len), 0)) == NULL) { (ptr_andata->nmem_error)++; return; @@ -967,5 +965,5 @@ if (result == 1) { - if ((new_msgpool = mstrcat(ptr_andata->msgpool, outomem_n.text, &(ptr_andata->msgpool_len), 0)) == NULL) { + if ((new_msgpool = mstrcat(ptr_andata->msgpool, (char*)get_status_msg(801), &(ptr_andata->msgpool_len), 0)) == NULL) { (ptr_andata->nmem_error)++; return; @@ -985,5 +983,5 @@ if (result == 1) { - if ((new_msgpool = mstrcat(ptr_andata->msgpool, outomem_n.text, &(ptr_andata->msgpool_len), 0)) == NULL) { + if ((new_msgpool = mstrcat(ptr_andata->msgpool, (char*)get_status_msg(801), &(ptr_andata->msgpool_len), 0)) == NULL) { (ptr_andata->nmem_error)++; return; @@ -1067,5 +1065,5 @@ if (result == 1) { - if ((new_msgpool = mstrcat(ptr_andata->msgpool, outomem_n.text, &(ptr_andata->msgpool_len), 0)) == NULL) { + if ((new_msgpool = mstrcat(ptr_andata->msgpool, (char*)get_status_msg(801), &(ptr_andata->msgpool_len), 0)) == NULL) { (ptr_andata->nmem_error)++; return; @@ -1142,5 +1140,5 @@ if (insert_lilid(ptr_andata->ptr_id_sentinel, ptr_andata->n_note_id)) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); } @@ -1149,5 +1147,5 @@ if ((new_msgpool = mstrcat(ptr_andata->msgpool, sql_command, &(ptr_andata->msgpool_len), 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); (ptr_andata->nmem_error)++; } @@ -1196,5 +1194,5 @@ if ((new_msgpool = mstrcat(ptr_andata->msgpool, sql_command, &(ptr_andata->msgpool_len), 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); (ptr_andata->nmem_error)++; return; Index: refdb.h =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdb.h,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -u -U2 -r1.14.2.1 -r1.14.2.2 --- refdb.h 15 Apr 2005 22:45:08 -0000 1.14.2.1 +++ refdb.h 3 Nov 2005 20:40:19 -0000 1.14.2.2 @@ -54,8 +54,4 @@ #define GETAS 7 -struct BSTRING { - char text[64]; /* the text of the string (up to 63 char + \0) */ - int length; /* the length of the string */ -}; Index: refdbd.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbd.c,v retrieving revision 1.74.2.19 retrieving revision 1.74.2.20 diff -u -U2 -r1.74.2.19 -r1.74.2.20 --- refdbd.c 28 Oct 2005 23:52:48 -0000 1.74.2.19 +++ refdbd.c 3 Nov 2005 20:40:19 -0000 1.74.2.20 @@ -89,14 +89,4 @@ }; -struct BSTRING outomem = {"out of memory", 13}; -struct BSTRING outomem_n = {"out of memory\n", 14}; -struct BSTRING connerr = {"could not connect to database server", 36}; -struct BSTRING connerr_n = {"could not connect to database server\n", 37}; -struct BSTRING argerr = {"missing argument", 16}; -struct BSTRING argerr_n = {"missing argument\n", 17}; -struct BSTRING positive = {"POS", 3}; -struct BSTRING negative = {"NEG", 3}; -struct BSTRING cgihead_html = {"Content-type: text/html\n\n", 25}; -struct BSTRING cgihead_plain = {"Content-type: text/plain\n\n", 26}; char log_file[PREFS_BUF_LEN] = "/var/log/refdbd.log"; /* custom log file */ @@ -1454,31 +1444,9 @@ /* let the client know what happened */ - if (ref_format == 6) { - html_head = load_html("refdbqp_head", refdblib); - html_foot = load_html("refdbqp_foot", refdblib); - if (!html_head || !html_foot) { - LOG_PRINT(LOG_ERR, "could not load cgi templates"); - } - else { - iwrite(ptr_child_clrequest->fd, cgihead_html.text, cgihead_html.length); - tiwrite(ptr_child_clrequest->fd, html_head, TERM_NO); - free(html_head); - if (ptr_addresult->success) { - tiwrite(ptr_child_clrequest->fd, "<tbody><tr><td class=\"result\">Reference was successfully added</td></tr>", TERM_NO); - } - else { - tiwrite(ptr_child_clrequest->fd, "<tbody><tr><td class=\"result\">Adding reference failed</td></tr>", TERM_NO); - } - tiwrite(ptr_child_clrequest->fd, html_foot, TERM_NO); - free(html_foot); - } - } - else { - if (retval != 1) { - n_client_status = read_status(ptr_child_clrequest->fd); - send_status(ptr_child_clrequest->fd, 0, TERM_NO); + if (retval != 1) { + n_client_status = read_status(ptr_child_clrequest->fd); + send_status(ptr_child_clrequest->fd, 0, TERM_NO); - sprintf(child_returnmsg, ULLSPEC" added:"ULLSPEC" skipped:"ULLSPEC" failed\n", (unsigned long long)(ptr_addresult->success), (unsigned long long)(ptr_addresult->skipped), (unsigned long long)(ptr_addresult->failure)); - } + sprintf(child_returnmsg, ULLSPEC" added:"ULLSPEC" skipped:"ULLSPEC" failed\n", (unsigned long long)(ptr_addresult->success), (unsigned long long)(ptr_addresult->skipped), (unsigned long long)(ptr_addresult->failure)); } } @@ -1492,34 +1460,9 @@ /* let the client know what happened */ - if (ref_format == 6) { - html_head = load_html("refdbqp_head", refdblib); - html_foot = load_html("refdbqp_foot", refdblib); - if (!html_head || !html_foot) { - LOG_PRINT(LOG_ERR, "could not load cgi templates"); - } - else { - iwrite(ptr_child_clrequest->fd, cgihead_html.text, cgihead_html.length); - tiwrite(ptr_child_clrequest->fd, html_head, TERM_NO); - free(html_head); - if (ptr_addresult->updated) { - tiwrite(ptr_child_clrequest->fd, "<tbody><tr><td class=\"result\">Reference was successfully updated</td></tr>", TERM_NO); - } - else if (ptr_addresult->success) { - tiwrite(ptr_child_clrequest->fd, "<tbody><tr><td class=\"result\">Reference was successfully added</td></tr>", TERM_NO); - } - else { - tiwrite(ptr_child_clrequest->fd, "<tbody><tr><td class=\"result\">Adding reference failed</td></tr>", TERM_NO); - } - tiwrite(ptr_child_clrequest->fd, html_foot, TERM_NO); - free(html_foot); - } - } - else { - if (retval != 1) { - n_client_status = read_status(ptr_child_clrequest->fd); - send_status(ptr_child_clrequest->fd, 0, TERM_NO); - - sprintf(child_returnmsg, ULLSPEC" updated:"ULLSPEC" added:"ULLSPEC" skipped:"ULLSPEC" failed\n", (unsigned long long)(ptr_addresult->updated), (unsigned long long)(ptr_addresult->success), (unsigned long long)(ptr_addresult->skipped), (unsigned long long)(ptr_addresult->failure)); - } + if (retval != 1) { + n_client_status = read_status(ptr_child_clrequest->fd); + send_status(ptr_child_clrequest->fd, 0, TERM_NO); + + sprintf(child_returnmsg, ULLSPEC" updated:"ULLSPEC" added:"ULLSPEC" skipped:"ULLSPEC" failed\n", (unsigned long long)(ptr_addresult->updated), (unsigned long long)(ptr_addresult->success), (unsigned long long)(ptr_addresult->skipped), (unsigned long long)(ptr_addresult->failure)); } } @@ -1530,5 +1473,5 @@ /* test whether we have a size argument */ if (optind == ptr_child_clrequest->inargc) { - iwrite(ptr_child_clrequest->fd, argerr_n.text, argerr_n.length); + iwrite(ptr_child_clrequest->fd, get_status_msg(111), strlen(get_status_msg(111))); } @@ -2130,5 +2073,5 @@ if ((ptr_clrequest = malloc(sizeof(struct CLIENT_REQUEST))) == NULL) { - LOG_PRINT(LOG_CRIT, outomem.text); + LOG_PRINT(LOG_CRIT, get_status_msg(801)); return NULL; } @@ -2183,5 +2126,5 @@ if ((ptr_new_clrequest = malloc(sizeof(struct CLIENT_REQUEST))) == NULL) { - LOG_PRINT(LOG_CRIT, outomem.text); + LOG_PRINT(LOG_CRIT, get_status_msg(801)); return NULL; } Index: refdbda.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbda.c,v retrieving revision 1.41.2.20 retrieving revision 1.41.2.21 diff -u -U2 -r1.41.2.20 -r1.41.2.21 --- refdbda.c 29 Sep 2005 22:35:59 -0000 1.41.2.20 +++ refdbda.c 3 Nov 2005 20:40:19 -0000 1.41.2.21 @@ -563,6 +563,4 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ int listdb(struct CLIENT_REQUEST* ptr_clrequest, int select, struct ADDRESULT* ptr_addresult) { - char* html_head; - char* html_foot; char* new_msg; const char* dbname; @@ -592,18 +590,4 @@ } - if (ptr_clrequest->n_cgi) { - html_head = load_html("refdbq_head", refdblib); - html_foot = load_html("refdbq_foot", refdblib); - if (!html_head || !html_foot) { - send_status(ptr_clrequest->fd, 802, TERM_NO); - LOG_PRINT(LOG_ERR, get_status_msg(802)); - free(html_head); - free(html_foot); - dbi_result_free(dbires); - dbi_conn_close(conn); - return 1; - } - } - if (select) { /* selectdb */ @@ -620,5 +604,4 @@ send_status(ptr_clrequest->fd, 801, TERM_NO); LOG_PRINT(LOG_INFO, get_status_msg(801)); - free(html_foot); dbi_result_free(dbires); dbi_conn_close(conn); @@ -632,5 +615,4 @@ send_status(ptr_clrequest->fd, 225, TERM_NO); LOG_PRINT(LOG_INFO, get_status_msg(225)); - free(html_foot); dbi_result_free(dbires); dbi_conn_close(conn); @@ -641,5 +623,4 @@ send_status(ptr_clrequest->fd, 226, TERM_NO); LOG_PRINT(LOG_INFO, get_status_msg(226)); - free(html_foot); dbi_result_free(dbires); dbi_conn_close(conn); @@ -650,14 +631,8 @@ send_status(ptr_clrequest->fd, 226, TERM_NO); LOG_PRINT(LOG_INFO, get_status_msg(226)); - free(html_foot); dbi_result_free(dbires); dbi_conn_close(conn); return 1; } - if (ptr_clrequest->n_cgi) { - tiwrite(ptr_clrequest->fd, "</td></tr>", TERM_NO); - tiwrite(ptr_clrequest->fd, html_foot, TERM_NO); - free(html_foot); - } } else { @@ -673,5 +648,4 @@ send_status(ptr_clrequest->fd, 801, TERM_NO); LOG_PRINT(LOG_INFO, get_status_msg(801)); - free(html_foot); dbi_result_free(dbires); dbi_conn_close(conn); @@ -1298,5 +1272,10 @@ dbires = dbi_conn_query(conn, sql_command); - if (!dbires || !dbi_result_get_numrows_affected(dbires)) { + + /* Postgres does not set numrows_affected for DROP statements so + we can't check easily whether the database was dropped */ + if (!dbires + || (strcmp(drivername, "pgsql") + && !dbi_result_get_numrows_affected(dbires))) { sprintf(sql_command, "249:%s\n", dbname); if ((new_msg = mstrcat(ptr_addresult->msg, sql_command, &(ptr_addresult->msg_len), 0)) == NULL) { @@ -1325,5 +1304,5 @@ dbires = dbi_conn_query(conn, sql_command); - if (dbi_conn_error_flag(conn)) { + if (!dbires /*dbi_conn_error_flag(conn)*/) { sprintf(sql_command, "250:%s\n", dbname); if ((new_msg = mstrcat(ptr_addresult->msg, sql_command, &(ptr_addresult->msg_len), 0)) == NULL) { @@ -1337,5 +1316,7 @@ } } - dbi_result_free(dbires); + else { + dbi_result_free(dbires); + } } } /* end if pgsql */ Index: refdbdbib.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbdbib.c,v retrieving revision 1.36.2.27 retrieving revision 1.36.2.28 diff -u -U2 -r1.36.2.27 -r1.36.2.28 --- refdbdbib.c 2 Oct 2005 23:38:16 -0000 1.36.2.27 +++ refdbdbib.c 3 Nov 2005 20:40:19 -0000 1.36.2.28 @@ -50,19 +50,5 @@ #include "dbfncs.h" -/* these externs are all defined in refdbd.c */ -extern struct BSTRING outomem; -extern struct BSTRING outomem_n; -extern struct BSTRING connerr; -extern struct BSTRING connerr_n; -extern struct BSTRING positive; -extern struct BSTRING negative; - -struct BSTRING noqueryaccess = {"could not access query results", 30}; -struct BSTRING noformatupdate = {"could not update format information", 35}; -struct BSTRING noformatupdatecolon = {"could not update format information: ", 37}; -struct BSTRING notempselect = {"temp table select failed", 24}; -struct BSTRING notempselectcolon = {"temp table select failed: ", 26}; -struct BSTRING clientwriterr = {"could not write to client", 25}; - +/* globals */ extern char server_ip[]; extern int n_log_level; Index: refdbdnote.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbdnote.c,v retrieving revision 1.25.2.14 retrieving revision 1.25.2.15 diff -u -U2 -r1.25.2.14 -r1.25.2.15 --- refdbdnote.c 2 Nov 2005 22:42:49 -0000 1.25.2.14 +++ refdbdnote.c 3 Nov 2005 20:40:19 -0000 1.25.2.15 @@ -38,12 +38,4 @@ #include "dbfncs.h" -/* some globals */ -extern struct BSTRING outomem; -extern struct BSTRING outomem_n; -extern struct BSTRING connerr; -extern struct BSTRING connerr_n; -extern struct BSTRING positive; -extern struct BSTRING negative; -extern char cs_term[]; #ifndef HAVE_ATOLL @@ -2265,5 +2257,5 @@ send_status(ptr_clrequest->fd, 404, TERM_NO); iwrite(ptr_clrequest->fd, sql_command, result_len); - iwrite(ptr_clrequest->fd, cs_term, TERM_LEN); + tiwrite(ptr_clrequest->fd, "", TERM_YES); ptr_addresult->success++; @@ -2282,5 +2274,5 @@ /* no notes found, send an empty body */ send_status(ptr_clrequest->fd, 402, TERM_NO); - iwrite(ptr... [truncated message content] |
