X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_write.c;h=8f495f1675d381ba64bcc72d68bb3afca3bfd03f;hp=587e75d2c809b8ed74575db2cb6dac7ef42b0744;hb=89d16cf15eda0e4802d18b8ad09bd3653508ebfc;hpb=519fefb91135ad52134b9fc4e82b3874f5525a2b diff --git a/data1/d1_write.c b/data1/d1_write.c index 587e75d..8f495f1 100644 --- a/data1/d1_write.c +++ b/data1/d1_write.c @@ -1,14 +1,27 @@ -/* - * Copyright (c) 1995-2002, Index Data. - * See the file LICENSE for details. - * Sebastian Hammer, Adam Dickmeiss - * - * $Id: d1_write.c,v 1.1 2002-10-22 12:53:33 adam Exp $ - */ +/* This file is part of the Zebra server. + Copyright (C) 1994-2009 Index Data + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +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 XML record */ #include -#include +#include #include #define IDSGML_MARGIN 75 @@ -31,40 +44,6 @@ static void indent (WRBUF b, int col) wrbuf_putc (b, ' '); } -static void wrbuf_write_cdata(WRBUF b, const char *msg, int len) -{ - int i; - - for (i = 0; i < len; i++) - { - switch (msg[i]) - { - case '"': - wrbuf_puts (b, """); - break; - case '\'': - wrbuf_puts (b, "'"); - break; - case '>': - wrbuf_puts (b, ">"); - break; - case '<': - wrbuf_puts (b, "<"); - break; - case '&': - wrbuf_puts (b, "&"); - break; - default: - wrbuf_putc(b, msg[i]); - } - } -} - -static void wrbuf_put_cdata(WRBUF b, const char *msg) -{ - wrbuf_write_cdata (b, msg, strlen(msg)); -} - static void wrbuf_put_xattr(WRBUF b, data1_xattr *p) { for (; p; p = p->next) @@ -73,13 +52,13 @@ static void wrbuf_put_xattr(WRBUF b, data1_xattr *p) if (p->what == DATA1I_xmltext) wrbuf_puts (b, p->name); else - wrbuf_put_cdata (b, p->name); + wrbuf_xmlputs (b, p->name); if (p->value) { wrbuf_putc (b, '='); wrbuf_putc (b, '"'); if (p->what == DATA1I_text) - wrbuf_put_cdata (b, p->value); + wrbuf_xmlputs (b, p->value); else wrbuf_puts (b, p->value); wrbuf_putc (b, '"'); @@ -87,6 +66,31 @@ static void wrbuf_put_xattr(WRBUF b, data1_xattr *p) } } +static void wrbuf_write_tag(WRBUF b, const char *tag, int opening) +{ + int i, fixup = 0; + + /* see if we must fix the tag.. The grs.marc filter produces + a data1 tree with not well-formed XML */ + if (*tag >= '0' && *tag <= '9') + fixup = 1; + for (i = 0; tag[i]; i++) + if (strchr( " <>$,()[]", tag[i])) + fixup = 1; + if (fixup) + { + wrbuf_puts(b, "tag"); + if (opening) + { + wrbuf_puts(b, " value=\""); + wrbuf_xmlputs(b, tag); + wrbuf_puts(b, "\""); + } + } + else + wrbuf_puts(b, tag); +} + static int nodetoidsgml(data1_node *n, int select, WRBUF b, int col, int pretty_format) { @@ -98,12 +102,10 @@ static int nodetoidsgml(data1_node *n, int select, WRBUF b, int col, if (c->which == DATA1N_preprocess) { - data1_xattr *p; - if (pretty_format) indent (b, col); wrbuf_puts (b, "u.preprocess.target); + wrbuf_xmlputs (b, c->u.preprocess.target); wrbuf_put_xattr (b, c->u.preprocess.attributes); if (c->child) wrbuf_puts(b, " "); @@ -124,12 +126,10 @@ static int nodetoidsgml(data1_node *n, int select, WRBUF b, int col, } else { - data1_xattr *p; - if (pretty_format) indent (b, col); - wrbuf_puts (b, "<"); - wrbuf_put_cdata (b, tag); + wrbuf_puts(b, "<"); + wrbuf_write_tag(b, tag, 1); wrbuf_put_xattr (b, c->u.tag.attributes); wrbuf_puts(b, ">"); if (pretty_format) @@ -140,7 +140,7 @@ static int nodetoidsgml(data1_node *n, int select, WRBUF b, int col, if (pretty_format) indent (b, col); wrbuf_puts(b, ""); if (pretty_format) wrbuf_puts (b, "\n"); @@ -165,7 +165,7 @@ static int nodetoidsgml(data1_node *n, int select, WRBUF b, int col, case DATA1I_text: if (!pretty_format || c->u.data.formatted_text) { - wrbuf_write_cdata (b, p, l); + wrbuf_xmlputs_n (b, p, l); } else { @@ -204,12 +204,12 @@ static int nodetoidsgml(data1_node *n, int select, WRBUF b, int col, } break; case DATA1I_num: - wrbuf_write_cdata(b, c->u.data.data, c->u.data.len); + wrbuf_xmlputs_n(b, c->u.data.data, c->u.data.len); if (pretty_format) wrbuf_puts(b, "\n"); break; case DATA1I_oid: - wrbuf_write_cdata(b, c->u.data.data, c->u.data.len); + wrbuf_xmlputs_n(b, c->u.data.data, c->u.data.len); if (pretty_format) wrbuf_puts(b, "\n"); } @@ -233,7 +233,7 @@ char *data1_nodetoidsgml (data1_handle dh, data1_node *n, int select, int *len) if (!data1_is_xmlmode (dh)) { wrbuf_puts (b, "<"); - wrbuf_puts (b, n->u.root.type); + wrbuf_write_tag(b, n->u.root.type, 1); wrbuf_puts (b, ">\n"); } if (nodetoidsgml(n, select, b, 0, 0 /* no pretty format */)) @@ -241,9 +241,17 @@ char *data1_nodetoidsgml (data1_handle dh, data1_node *n, int select, int *len) if (!data1_is_xmlmode (dh)) { wrbuf_puts (b, "u.root.type); + wrbuf_write_tag(b, n->u.root.type, 0); wrbuf_puts (b, ">\n"); } *len = wrbuf_len(b); return wrbuf_buf(b); } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +