X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fmarcdump.c;h=d441855ae8e5f41729ecab8c507f5d6aacde28f2;hb=b6d34be5a1131d2bb7ff367b7d5e498599f791a8;hp=bd71b7df281d3c4b5fb64f115388261703bc56a5;hpb=66d1e9b0dee9593f80022dcc3a30dab627f7b0bf;p=yaz-moved-to-github.git diff --git a/util/marcdump.c b/util/marcdump.c index bd71b7d..d441855 100644 --- a/util/marcdump.c +++ b/util/marcdump.c @@ -1,19 +1,28 @@ /* - * Copyright (c) 1995-2003, Index Data + * Copyright (c) 1995-2004, Index Data * See the file LICENSE for details. - * Sebastian Hammer, Adam Dickmeiss * - * $Id: marcdump.c,v 1.22 2003-02-25 18:35:49 adam Exp $ + * $Id: marcdump.c,v 1.25 2004-08-07 08:18:20 adam Exp $ */ #if HAVE_CONFIG_H #include #endif +#if HAVE_XML2 +#include +#include + +#include +#include + +#endif + #include #include #include #include +#include #if HAVE_LOCALE_H #include @@ -36,13 +45,64 @@ static void usage(const char *prog) { - fprintf (stderr, "Usage: %s [-c cfile] [-f from] [-t to] [-x] [-O] [-X] [-v] file...\n", + fprintf (stderr, "Usage: %s [-c cfile] [-f from] [-t to] [-x] [-O] [-X] [-I] [-v] file...\n", prog); } +#if HAVE_XML2 +void print_xpath_nodes(xmlNodeSetPtr nodes, FILE* output) { + xmlNodePtr cur; + int size; + int i; + + assert(output); + size = (nodes) ? nodes->nodeNr : 0; + + fprintf(output, "Result (%d nodes):\n", size); + for(i = 0; i < size; ++i) { + assert(nodes->nodeTab[i]); + + if(nodes->nodeTab[i]->type == XML_NAMESPACE_DECL) + { + xmlNsPtr ns; + + ns = (xmlNsPtr)nodes->nodeTab[i]; + cur = (xmlNodePtr)ns->next; + if(cur->ns) { + fprintf(output, "= namespace \"%s\"=\"%s\" for node %s:%s\n", + ns->prefix, ns->href, cur->ns->href, cur->name); + } else { + fprintf(output, "= namespace \"%s\"=\"%s\" for node %s\n", + ns->prefix, ns->href, cur->name); + } + } + else if(nodes->nodeTab[i]->type == XML_ELEMENT_NODE) + { + cur = nodes->nodeTab[i]; + if(cur->ns) { + fprintf(output, "= element node \"%s:%s\"\n", + cur->ns->href, cur->name); + } + else + { + fprintf(output, "= element node \"%s\"\n", + cur->name); + } + } + else + { + cur = nodes->nodeTab[i]; + fprintf(output, "= node \"%s\": type %d\n", cur->name, cur->type); + } + } +} +#endif + int main (int argc, char **argv) { int r; + int libxml_dom_test = 0; + int print_offset = 0; char *arg; int verbose = 0; FILE *inf; @@ -52,7 +112,7 @@ int main (int argc, char **argv) int xml = 0; FILE *cfile = 0; char *from = 0, *to = 0; - + int num = 1; #if HAVE_LOCALE_H setlocale(LC_CTYPE, ""); @@ -63,7 +123,7 @@ int main (int argc, char **argv) #endif #endif - while ((r = options("vc:xOXf:t:", argv, argc, &arg)) != -2) + while ((r = options("pvc:xOXIf:t:2", argv, argc, &arg)) != -2) { int count; no++; @@ -89,8 +149,17 @@ int main (int argc, char **argv) case 'X': xml = YAZ_MARC_MARCXML; break; + case 'I': + xml = YAZ_MARC_ISO2709; + break; + case 'p': + print_offset = 1; + break; + case '2': + libxml_dom_test = 1; + break; case 0: - inf = fopen (arg, "r"); + inf = fopen (arg, "rb"); count = 0; if (!inf) { @@ -114,6 +183,7 @@ int main (int argc, char **argv) "unsupported\n", from, to); exit(2); } + yaz_marc_iconv(mt, cd); } yaz_marc_xml(mt, xml); yaz_marc_debug(mt, verbose); @@ -125,7 +195,16 @@ int main (int argc, char **argv) r = fread (buf, 1, 5, inf); if (r < 5) + { + if (r && print_offset) + printf ("Extra %d bytes", r); break; + } + if (print_offset) + { + long off = ftell(inf); + printf ("Record %d offset %ld\n", num, (long) off); + } len = atoi_n(buf, 5); if (len < 25 || len > 100000) break; @@ -136,31 +215,44 @@ int main (int argc, char **argv) r = yaz_marc_decode_buf (mt, buf, -1, &result, &rlen); if (r <= 0) break; - if (!cd) - fwrite (result, rlen, 1, stdout); - else - { - char outbuf[12]; - size_t inbytesleft = rlen; - const char *inp = result; - - while (inbytesleft) - { - size_t outbytesleft = sizeof(outbuf); - char *outp = outbuf; - size_t r = yaz_iconv (cd, (char**) &inp, - &inbytesleft, - &outp, &outbytesleft); - if (r == (size_t) (-1)) - { - int e = yaz_iconv_error(cd); - if (e != YAZ_ICONV_E2BIG) - break; - } - fwrite (outbuf, outp - outbuf, 1, stdout); - } - } + fwrite (result, rlen, 1, stdout); +#if HAVE_XML2 + if (libxml_dom_test) + { + xmlDocPtr doc = xmlParseMemory(result, rlen); + if (!doc) + fprintf(stderr, "xmLParseMemory failed\n"); + else + { + int i; + xmlXPathContextPtr xpathCtx; + xmlXPathObjectPtr xpathObj; + static const char *xpathExpr[] = { + "/record/datafield[@tag='245']/subfield[@code='a']", + "/record/datafield[@tag='100']/subfield", + "/record/datafield[@tag='245']/subfield[@code='a']", + "/record/datafield[@tag='650']/subfield", + "/record/datafield[@tag='650']", + 0}; + + xpathCtx = xmlXPathNewContext(doc); + for (i = 0; xpathExpr[i]; i++) { + xpathObj = xmlXPathEvalExpression(xpathExpr[i], xpathCtx); + if(xpathObj == NULL) { + fprintf(stderr,"Error: unable to evaluate xpath expression \"%s\"\n", xpathExpr[i]); + } + else + { + print_xpath_nodes(xpathObj->nodesetval, stdout); + xmlXPathFreeObject(xpathObj); + } + } + xmlXPathFreeContext(xpathCtx); + xmlFreeDoc(doc); + } + } +#endif if (cfile) { char *p = buf; @@ -180,13 +272,16 @@ int main (int argc, char **argv) } fprintf (cfile, "\"\n"); } + num++; } count++; if (cd) yaz_iconv_close(cd); + yaz_marc_destroy(mt); } if (cfile) fprintf (cfile, "};\n"); + fclose(inf); break; case 'v': verbose++;