* Copyright (c) 1995-2002, Index Data
* See the file LICENSE for details.
*
- * $Id: marcdisp.c,v 1.23 2002-10-04 19:11:17 adam Exp $
+ * $Id: marcdisp.c,v 1.24 2002-12-03 10:03:27 adam Exp $
*/
#if HAVE_CONFIG_H
{
char str[80];
int i;
- if (xml > 1)
+ switch(xml)
{
+ case YAZ_MARC_XML:
+ wrbuf_puts (wr, "<iso2709\n");
+ sprintf (str, " RecordStatus=\"%c\"\n", buf[5]);
+ wrbuf_puts (wr, str);
+ sprintf (str, " TypeOfRecord=\"%c\"\n", buf[6]);
+ wrbuf_puts (wr, str);
+ for (i = 1; i<=19; i++)
+ {
+ sprintf (str, " ImplDefined%d=\"%c\"\n", i, buf[6+i]);
+ wrbuf_puts (wr, str);
+ }
+ wrbuf_puts (wr, ">\n");
+ break;
+ case YAZ_MARC_OAIMARC:
wrbuf_puts(
wr,
"<oai_marc xmlns=\"http://www.openarchives.org/OIA/oai_marc\""
sprintf (str, " status=\"%c\" type=\"%c\" catForm=\"%c\">\n",
buf[5], buf[6], buf[7]);
wrbuf_puts (wr, str);
- }
- else
- {
- wrbuf_puts (wr, "<iso2709\n");
- sprintf (str, " RecordStatus=\"%c\"\n", buf[5]);
- wrbuf_puts (wr, str);
- sprintf (str, " TypeOfRecord=\"%c\"\n", buf[6]);
- wrbuf_puts (wr, str);
- for (i = 1; i<=19; i++)
- {
- sprintf (str, " ImplDefined%d=\"%c\"\n", i, buf[6+i]);
- wrbuf_puts (wr, str);
- }
- wrbuf_puts (wr, ">\n");
+ break;
+ case YAZ_MARC_MARCXML:
+ wrbuf_printf(
+ wr,
+ "<collection xmlns=\"http://www.loc.gov/MARC21/slim\">\n"
+ " <record>\n"
+ " <leader>%.24s</leader>\n", buf);
+ break;
}
}
if (debug)
}
else if (!memcmp (tag, "00", 2))
identifier_flag = 0;
-
-
- if (xml)
- {
- if (xml > 1)
- {
- if (identifier_flag)
- wrbuf_puts (wr, "<varfield id=\"");
- else
- wrbuf_puts (wr, "<fixfield id=\"");
- wrbuf_puts (wr, tag);
- wrbuf_puts (wr, "\"");
- }
- else
- {
- wrbuf_puts (wr, "<field tag=\"");
- wrbuf_puts (wr, tag);
- wrbuf_puts (wr, "\"");
- }
- }
- else
+
+ switch(xml)
{
+ case YAZ_MARC_LINE:
if (debug)
wrbuf_puts (wr, "Tag: ");
wrbuf_puts (wr, tag);
wrbuf_puts (wr, " ");
+ break;
+ case YAZ_MARC_XML:
+ wrbuf_printf (wr, "<field tag=\"%s\"", tag);
+ break;
+ case YAZ_MARC_OAIMARC:
+ if (identifier_flag)
+ wrbuf_printf (wr, " <varfield id=\"%s\"", tag);
+ else
+ wrbuf_printf (wr, " <fixfield id=\"%s\"", tag);
+ break;
+ case YAZ_MARC_MARCXML:
+ if (identifier_flag)
+ wrbuf_printf (wr, " <datafield tag=\"%s\"", tag);
+ else
+ wrbuf_printf (wr, " <controlfield tag=\"%s\"", tag);
}
if (identifier_flag)
{
- if (debug && !xml)
- wrbuf_puts (wr, " Ind: ");
for (j = 0; j<indicator_length; j++, i++)
{
- if (xml)
+ switch(xml)
{
- char nostr[30];
- if (xml > 1)
- sprintf (nostr, " i%d=\"%c\"", j+1, buf[i]);
- else
- sprintf (nostr, " Indicator%d=\"%c\"", j+1, buf[i]);
- wrbuf_puts (wr, nostr);
- }
- else
+ case YAZ_MARC_LINE:
+ if (debug)
+ wrbuf_puts (wr, " Ind: ");
wrbuf_putc (wr, buf[i]);
+ break;
+ case YAZ_MARC_XML:
+ wrbuf_printf (wr, " Indicator%d=\"%c\"", j+1, buf[i]);
+ break;
+ case YAZ_MARC_OAIMARC:
+ wrbuf_printf (wr, " i%d=\"%c\"", j+1, buf[i]);
+ break;
+ case YAZ_MARC_MARCXML:
+ wrbuf_printf (wr, " ind%d=\"%c\"", j+1, buf[i]);
+ }
}
}
if (xml)
if (identifier_flag)
{
i++;
- if (xml)
+ switch(xml)
{
- if (xml > 1)
- wrbuf_puts (wr, " <subfield label=\"");
- else
+ case YAZ_MARC_LINE:
+ wrbuf_puts (wr, " $");
+ for (j = 1; j<identifier_length; j++, i++)
+ wrbuf_putc (wr, buf[i]);
+ wrbuf_putc (wr, ' ');
+ break;
+ case YAZ_MARC_XML:
wrbuf_puts (wr, " <subfield code=\"");
for (j = 1; j<identifier_length; j++, i++)
wrbuf_putc (wr, buf[i]);
wrbuf_puts (wr, "\">");
- }
- else
- {
- wrbuf_puts (wr, " $");
+ break;
+ case YAZ_MARC_OAIMARC:
+ wrbuf_puts (wr, " <subfield label=\"");
for (j = 1; j<identifier_length; j++, i++)
wrbuf_putc (wr, buf[i]);
- wrbuf_putc (wr, ' ');
+ wrbuf_puts (wr, "\">");
+ break;
+ case YAZ_MARC_MARCXML:
+ wrbuf_puts (wr, " <subfield code=\"");
+ for (j = 1; j<identifier_length; j++, i++)
+ wrbuf_putc (wr, buf[i]);
+ wrbuf_puts (wr, "\">");
+ break;
}
while (buf[i] != ISO2709_RS && buf[i] != ISO2709_IDFS &&
buf[i] != ISO2709_FS && i < end_offset)
wrbuf_puts (wr, " <!-- separator but not at end of field -->\n");
if (buf[i] != ISO2709_RS && buf[i] != ISO2709_FS)
wrbuf_puts (wr, " <!-- no separator at end of field -->\n");
- if (xml)
+ switch(xml)
{
- if (xml > 1)
- {
- if (identifier_flag)
- wrbuf_puts (wr, "</varfield>\n");
- else
- wrbuf_puts (wr, "</fixfield>\n");
- }
+ case YAZ_MARC_LINE:
+ break;
+ case YAZ_MARC_XML:
+ wrbuf_puts (wr, "</field>\n");
+ break;
+ case YAZ_MARC_OAIMARC:
+ if (identifier_flag)
+ wrbuf_puts (wr, " </varfield>\n");
else
- wrbuf_puts (wr, "</field>\n");
+ wrbuf_puts (wr, " </fixfield>\n");
+ break;
+ case YAZ_MARC_MARCXML:
+ if (identifier_flag)
+ wrbuf_puts (wr, " </datafield>\n");
+ else
+ wrbuf_puts (wr, " </controlfield>\n");
+ break;
}
}
- if (xml)
+ switch(xml)
{
- if (xml > 1)
- wrbuf_puts (wr, "</oai_marc>\n");
- else
- wrbuf_puts (wr, "</iso2709>\n");
+ case YAZ_MARC_LINE:
+ wrbuf_puts (wr, "");
+ break;
+ case YAZ_MARC_XML:
+ wrbuf_puts (wr, "</iso2709>\n");
+ break;
+ case YAZ_MARC_OAIMARC:
+ wrbuf_puts (wr, "</oai_marc>\n");
+ break;
+ case YAZ_MARC_MARCXML:
+ wrbuf_puts (wr, " </record>\n</collection>\n");
+ break;
}
- wrbuf_puts (wr, "");
return record_length;
}
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Id: marcdump.c,v 1.17 2002-10-04 10:19:58 adam Exp $
+ * $Id: marcdump.c,v 1.18 2002-12-03 10:03:27 adam Exp $
*/
#if HAVE_CONFIG_H
#include <stdlib.h>
#include <string.h>
#include <errno.h>
-#include <yaz/wrbuf.h>
#include <yaz/marcdisp.h>
#include <yaz/yaz-util.h>
#include <yaz/xmalloc.h>
static void usage(const char *prog)
{
- fprintf (stderr, "Usage: %s [-c cfile] [-x] [-O] [-v] file...\n", prog);
+ fprintf (stderr, "Usage: %s [-c cfile] [-x] [-O] [-X] [-v] file...\n",
+ prog);
}
int main (int argc, char **argv)
int xml = 0;
FILE *cfile = 0;
- while ((r = options("vc:xO", argv, argc, &arg)) != -2)
+ while ((r = options("vc:xOX", argv, argc, &arg)) != -2)
{
int count;
no++;
cfile = fopen (arg, "w");
break;
case 'x':
- xml = 1;
+ xml = YAZ_MARC_XML;
break;
case 'O':
- xml = 2;
+ xml = YAZ_MARC_OAIMARC;
+ break;
+ case 'X':
+ xml = YAZ_MARC_MARCXML;
break;
case 0:
inf = fopen (arg, "r");
/*
- * $Id: zoom-c.c,v 1.8 2002-11-30 22:30:51 mike Exp $
+ * $Id: zoom-c.c,v 1.9 2002-12-03 10:03:27 adam Exp $
*
* ZOOM layer for C, connections, result sets, queries.
*/
#include <yaz/otherinfo.h>
#include <yaz/log.h>
#include <yaz/pquery.h>
+#include <yaz/marcdisp.h>
#include <yaz/diagbib1.h>
#include <yaz/charneg.h>
#include <yaz/ill.h>
}
return 0;
}
- else if (!strcmp (type, "xml") &&
- npr->which == Z_NamePlusRecord_databaseRecord)
+ else if (npr->which == Z_NamePlusRecord_databaseRecord &&
+ (!strcmp (type, "xml") || !strcmp(type, "MarcXML")))
{
Z_External *r = (Z_External *) npr->u.databaseRecord;
oident *ent = oid_getentbyoid(r->direct_reference);
}
else if (r->which == Z_External_octet)
{
+ int marc_decode_type = YAZ_MARC_OAIMARC;
+
+ if (!strcmp(type, "MarcXML"))
+ marc_decode_type = YAZ_MARC_MARCXML;
switch (ent->value)
{
case VAL_SOIF:
r->u.octet_aligned->buf,
rec->wrbuf_marc, 0,
r->u.octet_aligned->len,
- 2) > 0)
+ marc_decode_type) > 0)
{
if (len) *len = wrbuf_len(rec->wrbuf_marc);
return wrbuf_buf(rec->wrbuf_marc);