-/* $Id: recgrs.c,v 1.60 2002-08-17 07:59:54 adam Exp $
+/* $Id: recgrs.c,v 1.67 2002-09-24 19:45:14 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
02111-1307, USA.
*/
-
-
#include <stdio.h>
#include <assert.h>
#include <sys/types.h>
grs_add_handler (h, recTypeGrs_tcl);
#endif
grs_add_handler (h, recTypeGrs_marc);
-#if YAZ_HAVE_EXPAT
+#if HAVE_EXPAT_H
grs_add_handler (h, recTypeGrs_xml);
#endif
return h;
for (xp = n->u.tag.attributes; xp; xp = xp->next)
{
char attr_tag_path_full[1024];
+ int int_len = flen;
sprintf (attr_tag_path_full, "@%s/%.*s",
- xp->name, flen, tag_path_full);
+ xp->name, int_len, tag_path_full);
wrd->reg_type = '0';
wrd->attrUse = 1;
wrd->length = strlen(attr_tag_path_full);
(*p->tokenAdd)(wrd);
- wrd->attrUse = 1015;
- wrd->reg_type = 'w';
- wrd->string = xp->value;
- wrd->length = strlen(xp->value);
-
- (*p->tokenAdd)(wrd);
+ if (xp->value)
+ {
+ wrd->attrUse = 1015;
+ wrd->reg_type = 'w';
+ wrd->string = xp->value;
+ wrd->length = strlen(xp->value);
+ (*p->tokenAdd)(wrd);
+ }
wrd->reg_type = '0';
wrd->attrUse = 2;
{
printf("%*s", level * 4, "");
printf("Data: ");
- if (n->u.data.len > 32)
- printf("'%.24s ... %.6s'\n", n->u.data.data,
+ if (n->u.data.len > 256)
+ printf("'%.240s ... %.6s'\n", n->u.data.data,
n->u.data.data + n->u.data.len-6);
else if (n->u.data.len > 0)
printf("'%.*s'\n", n->u.data.len, n->u.data.data);
gri.dh = p->dh;
if (read_grs_type (h, &gri, p->subType, &n))
- return RECCTRL_EXTRACT_ERROR;
+ return RECCTRL_EXTRACT_ERROR_NO_SUCH_FILTER;
if (!n)
return RECCTRL_EXTRACT_EOF;
oe.proto = PROTO_Z3950;
if (dumpkeys(n, p, 0, &wrd) < 0)
{
data1_free_tree(p->dh, n);
- return RECCTRL_EXTRACT_ERROR;
+ return RECCTRL_EXTRACT_ERROR_GENERIC;
}
data1_free_tree(p->dh, n);
return RECCTRL_EXTRACT_OK;
}
}
-static void add_idzebra_info (struct recRetrieveCtrl *p, data1_node *top,
- NMEM mem)
+/* Add Zebra info in separate namespace ...
+ <root
+ ...
+ <metadata xmlns="http://www.indexdata.dk/zebra/">
+ <size>359</size>
+ <localnumber>447</localnumber>
+ <filename>records/genera.xml</filename>
+ </metadata>
+ </root>
+*/
+
+static void zebra_xml_metadata (struct recRetrieveCtrl *p, data1_node *top,
+ NMEM mem)
{
- const char *idzebra_ns[7];
+ const char *idzebra_ns[3];
+ const char *i2 = "\n ";
+ const char *i4 = "\n ";
+ data1_node *n;
- idzebra_ns[0] = "xmlns:idzebra";
+ idzebra_ns[0] = "xmlns";
idzebra_ns[1] = "http://www.indexdata.dk/zebra/";
idzebra_ns[2] = 0;
- data1_tag_add_attr (p->dh, mem, top, idzebra_ns);
+ data1_mk_text (p->dh, mem, i2, top);
- data1_mk_tag_data_int (p->dh, top, "idzebra:size", p->recordSize,
- mem);
- if (p->score != -1)
- data1_mk_tag_data_int (p->dh, top, "idzebra:score",
- p->score, mem);
+ n = data1_mk_tag (p->dh, mem, "idzebra", idzebra_ns, top);
+
+ data1_mk_text (p->dh, mem, "\n", top);
+
+ data1_mk_text (p->dh, mem, i4, n);
- data1_mk_tag_data_int (p->dh, top, "idzebra:localnumber", p->localno,
- mem);
+ data1_mk_tag_data_int (p->dh, n, "size", p->recordSize, mem);
+
+ if (p->score != -1)
+ {
+ data1_mk_text (p->dh, mem, i4, n);
+ data1_mk_tag_data_int (p->dh, n, "score", p->score, mem);
+ }
+ data1_mk_text (p->dh, mem, i4, n);
+ data1_mk_tag_data_int (p->dh, n, "localnumber", p->localno, mem);
if (p->fname)
- data1_mk_tag_data_text(p->dh, top, "idzebra:filename",
- p->fname, mem);
+ {
+ data1_mk_text (p->dh, mem, i4, n);
+ data1_mk_tag_data_text(p->dh, n, "filename", p->fname, mem);
+ }
+ data1_mk_text (p->dh, mem, i2, n);
}
static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
p->input_format : VAL_SUTRS))
{
case VAL_TEXT_XML:
- add_idzebra_info (p, top, mem);
+ zebra_xml_metadata (p, top, mem);
+
+#if 0
+ data1_pr_tree (p->dh, node, stdout);
+#endif
if (p->encoding)
data1_iconv (p->dh, mem, node, p->encoding, "UTF-8");