-/* $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.17 2007-01-15 15:10:14 adam Exp $
+ Copyright (C) 1995-2007
+ Index Data ApS
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
/* converts data1 tree to ISO2709/MARC record */
#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)
{
int argc;
if (!(f = data1_path_fopen(dh, file, "r")))
- {
- yaz_log(LOG_WARN|LOG_ERRNO, "%s", file);
return 0;
- }
res->name = 0;
res->reference = VAL_NONE;
{
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);
* Locate some data under this node. This routine should handle variants
* prettily.
*/
-static char *get_data(data1_node *n, int *len)
+static char *get_data(data1_node *n, int *len, int chop)
{
char *r;
{
int i;
*len = n->u.data.len;
-
- for (i = 0; i<*len; i++)
- if (!d1_isspace(n->u.data.data[i]))
- break;
- while (*len && d1_isspace(n->u.data.data[*len - 1]))
- (*len)--;
- *len = *len - i;
- if (*len > 0)
- return n->u.data.data + i;
+
+ if (chop)
+ {
+ for (i = 0; i<*len; i++)
+ if (!d1_isspace(n->u.data.data[i]))
+ break;
+ while (*len && d1_isspace(n->u.data.data[*len - 1]))
+ (*len)--;
+ *len = *len - i;
+ if (*len > 0)
+ return n->u.data.data + i;
+ }
+ else
+ if (*len > 0)
+ return n->u.data.data;
}
if (n->which == DATA1N_tag)
n = n->child;
#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);
else if (!strcmp(field->u.tag.tag, "leader"))
{
int dlen = 0;
- char *dbuf = get_data(subf, &dlen);
+ char *dbuf = get_data(subf, &dlen, 0);
if (dlen > 24)
dlen = 24;
if (dbuf && dlen > 0)
for (; subf; subf = subf->next)
{
if (!control_field)
+ {
+ if (marc_xml && subf->which != DATA1N_tag)
+ continue; /* we skip comments, cdata .. */
len += p->identifier_length;
- get_data(subf, &dlen);
+ }
+ get_data(subf, &dlen, control_field ? 0 : 1);
len += dlen;
}
}
*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);
if (!strcmp(xa->name, "ind1"))
indicator_data[0] = xa->value[0];
if (!strcmp(xa->name, "ind2"))
- indicator_data[1] = xa->value[1];
+ indicator_data[1] = xa->value[0];
if (!strcmp(xa->name, "ind3"))
- indicator_data[2] = xa->value[2];
+ indicator_data[2] = xa->value[0];
}
}
if (!control_field)
const char *identifier = "a";
if (marc_xml)
{
- if (subf->which == DATA1N_tag &&
- !strcmp(subf->u.tag.tag, "subfield"))
- {
- data1_xattr *xa;
- for (xa = subf->u.tag.attributes; xa; xa = xa->next)
- if (!strcmp(xa->name, "code"))
- identifier = xa->value;
- }
+ data1_xattr *xa;
+ if (subf->which != DATA1N_tag)
+ continue;
+ if (strcmp(subf->u.tag.tag, "subfield"))
+ yaz_log(YLOG_WARN, "Unhandled tag %s",
+ subf->u.tag.tag);
+
+ for (xa = subf->u.tag.attributes; xa; xa = xa->next)
+ if (!strcmp(xa->name, "code"))
+ identifier = xa->value;
}
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;
memcpy (op + data_p+1, identifier, p->identifier_length-1);
data_p += p->identifier_length;
}
- data = get_data(subf, &dlen);
+ data = get_data(subf, &dlen, control_field ? 0 : 1);
memcpy (op + data_p, data, dlen);
data_p += dlen;
}
*len = nodetomarc(dh, p, n, selected, buf, size);
return *buf;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / idzebra-moved-to-github.git / blobdiff