X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_marc.c;h=2f06142c5f2929b68c6d090ba5d0c31f0262b2e3;hb=98f0cc2d7eeed27912edb88bf16512bb622b19ee;hp=0d257d642c48b22803d2d4c6177f05532e031ada;hpb=db9513f9eca4ef13d3cea779a695bb822fd973a9;p=yaz-moved-to-github.git diff --git a/retrieval/d1_marc.c b/retrieval/d1_marc.c index 0d257d6..2f06142 100644 --- a/retrieval/d1_marc.c +++ b/retrieval/d1_marc.c @@ -1,10 +1,22 @@ /* - * Copyright (c) 1995-1998, Index Data. + * Copyright (c) 1995-1999, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: d1_marc.c,v $ - * Revision 1.13 1998-10-13 16:09:52 adam + * Revision 1.17 2002-04-04 20:49:46 adam + * New functions yaz_is_abspath, yaz_path_fopen_base + * + * Revision 1.16 1999/11/30 13:47:12 adam + * Improved installation. Moved header files to include/yaz. + * + * Revision 1.15 1999/10/21 12:06:29 adam + * Retrieval module no longer uses ctype.h - functions. + * + * Revision 1.14 1999/08/27 09:40:32 adam + * Renamed logf function to yaz_log. Removed VC++ project files. + * + * Revision 1.13 1998/10/13 16:09:52 adam * Added support for arbitrary OID's for tagsets, schemas and attribute sets. * Added support for multiple attribute set references and tagset references * from an abstract syntax file. @@ -56,15 +68,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include data1_marctab *data1_read_marctab (data1_handle dh, const char *file) { @@ -75,9 +86,9 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file) int lineno = 0; int argc; - if (!(f = yaz_path_fopen(data1_get_tabpath(dh), file, "r"))) + if (!(f = data1_path_fopen(dh, file, "r"))) { - logf(LOG_WARN|LOG_ERRNO, "%s", file); + yaz_log(LOG_WARN|LOG_ERRNO, "%s", file); return 0; } @@ -102,8 +113,8 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file) { if (argc != 2) { - logf(LOG_WARN, "%s:%d:Missing arg for %s", file, lineno, - *argv); + yaz_log(LOG_WARN, "%s:%d:Missing arg for %s", file, lineno, + *argv); continue; } res->name = nmem_strdup(mem, argv[1]); @@ -112,14 +123,14 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file) { if (argc != 2) { - logf(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno, - *argv); + yaz_log(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno, + *argv); continue; } if ((res->reference = oid_getvalbyname(argv[1])) == VAL_NONE) { - logf(LOG_WARN, "%s:%d: Unknown tagset reference '%s'", - file, lineno, argv[1]); + yaz_log(LOG_WARN, "%s:%d: Unknown tagset reference '%s'", + file, lineno, argv[1]); continue; } } @@ -127,8 +138,8 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file) { if (argc != 2) { - logf(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno, - *argv); + yaz_log(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno, + *argv); continue; } res->length_data_entry = atoi(argv[1]); @@ -137,8 +148,8 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file) { if (argc != 2) { - logf(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno, - *argv); + yaz_log(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno, + *argv); continue; } res->length_starting = atoi(argv[1]); @@ -147,8 +158,8 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file) { if (argc != 2) { - logf(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno, - *argv); + yaz_log(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno, + *argv); continue; } res->length_implementation = atoi(argv[1]); @@ -157,8 +168,8 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file) { if (argc != 2) { - logf(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno, - *argv); + yaz_log(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno, + *argv); continue; } strncpy(res->future_use, argv[1], 2); @@ -167,8 +178,8 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file) { if (argc != 2) { - logf(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno, - *argv); + yaz_log(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno, + *argv); continue; } res->force_indicator_length = atoi(argv[1]); @@ -177,15 +188,15 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file) { if (argc != 2) { - logf(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno, - *argv); + yaz_log(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno, + *argv); continue; } res->force_identifier_length = atoi(argv[1]); } else - logf(LOG_WARN, "%s:%d: Unknown directive '%s'", file, lineno, - *argv); + yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'", file, lineno, + *argv); fclose(f); return res; @@ -210,7 +221,7 @@ static char *get_data(data1_node *n, int *len) } *len = n->u.data.len; - while (*len && isspace(n->u.data.data[*len - 1])) + while (*len && d1_isspace(n->u.data.data[*len - 1])) (*len)--; return n->u.data.data; } @@ -251,12 +262,12 @@ static int nodetomarc(data1_marctab *p, data1_node *n, int selected, char *op; data1_node *field, *subf; - logf (LOG_DEBUG, "nodetomarc"); + yaz_log (LOG_DEBUG, "nodetomarc"); for (field = n->child; field; field = field->next) { if (field->which != DATA1N_tag) { - logf(LOG_WARN, "Malformed field composition for marc output."); + yaz_log(LOG_WARN, "Malformed field composition for marc output."); return -1; } if (selected && !field->u.tag.node_selected) @@ -277,7 +288,7 @@ static int nodetomarc(data1_marctab *p, data1_node *n, int selected, { if (subf->which != DATA1N_tag) { - logf(LOG_WARN, + yaz_log(LOG_WARN, "Malformed subfield composition for marc output."); return -1; }