-/* $Id: d1_marc.c,v 1.5 2003-11-28 23:06:59 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
- Index Data Aps
+/* $Id: d1_marc.c,v 1.10 2005-01-15 19:38:18 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
#include <stdlib.h>
#include <string.h>
-#include <yaz/oid.h>
#include <yaz/log.h>
+#include <yaz/oid.h>
#include <yaz/marcdisp.h>
#include <yaz/readconf.h>
#include <yaz/xmalloc.h>
#include <yaz/tpath.h>
-#include <data1.h>
+#include <idzebra/data1.h>
data1_marctab *data1_read_marctab (data1_handle dh, const char *file)
{
if (!(f = data1_path_fopen(dh, file, "r")))
{
- yaz_log(LOG_WARN|LOG_ERRNO, "%s", file);
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", file);
return 0;
}
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d:Missing arg for %s", file, lineno,
+ yaz_log(YLOG_WARN, "%s:%d:Missing arg for %s", file, lineno,
*argv);
continue;
}
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno,
+ yaz_log(YLOG_WARN, "%s:%d: Missing arg for %s", file, lineno,
*argv);
continue;
}
if ((res->reference = oid_getvalbyname(argv[1])) == VAL_NONE)
{
- yaz_log(LOG_WARN, "%s:%d: Unknown tagset reference '%s'",
+ yaz_log(YLOG_WARN, "%s:%d: Unknown tagset reference '%s'",
file, lineno, argv[1]);
continue;
}
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno,
+ yaz_log(YLOG_WARN, "%s:%d: Missing arg for %s", file, lineno,
*argv);
continue;
}
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno,
+ yaz_log(YLOG_WARN, "%s:%d: Missing arg for %s", file, lineno,
*argv);
continue;
}
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno,
+ yaz_log(YLOG_WARN, "%s:%d: Missing arg for %s", file, lineno,
*argv);
continue;
}
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno,
+ yaz_log(YLOG_WARN, "%s:%d: Missing arg for %s", file, lineno,
*argv);
continue;
}
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno,
+ yaz_log(YLOG_WARN, "%s:%d: Missing arg for %s", file, lineno,
*argv);
continue;
}
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Missing arg for %s", file, lineno,
+ yaz_log(YLOG_WARN, "%s:%d: Missing arg for %s", file, lineno,
*argv);
continue;
}
res->force_identifier_length = atoi(argv[1]);
}
else
- yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'", file, lineno,
+ yaz_log(YLOG_WARN, "%s:%d: Unknown directive '%s'", file, lineno,
*argv);
fclose(f);
#if 0
data1_pr_tree(dh, n, stdout);
#endif
- yaz_log (LOG_DEBUG, "nodetomarc");
+ yaz_log (YLOG_DEBUG, "nodetomarc");
memcpy (leader+5, p->record_status, 1);
memcpy (leader+6, p->implementation_codes, 4);
memint (leader+10, p->indicator_length, 1);
memint (leader+11, p->identifier_length, 1);
- memint (leader+12, base_address, 5);
memcpy (leader+17, p->user_systems, 3);
memint (leader+20, p->length_data_entry, 1);
memint (leader+21, p->length_starting, 1);
*buf = (char *)xrealloc(*buf, *size = len);
op = *buf;
+
+ /* we know the base address now */
+ memint (leader+12, base_address, 5);
+
+ /* copy temp leader to real output buf op */
memcpy (op, leader, 24);
memint (op, len, 5);
}
}
else if (subf->which != DATA1N_tag)
- yaz_log(LOG_WARN, "Malformed fields for marc output.");
+ yaz_log(YLOG_WARN, "Malformed fields for marc output.");
else
identifier = subf->u.tag.tag;
op[data_p] = ISO2709_IDFS;