-/*
- * Copyright (C) 1994-2002, Index Data
- * All rights reserved.
- *
- * $Id: recgrs.c,v 1.58 2002-08-02 10:07:48 adam Exp $
- */
+/* $Id: recgrs.c,v 1.70 2002-12-02 16:55:14 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+ Index Data Aps
+
+This file is part of the Zebra server.
+
+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 Zebra; see the file LICENSE.zebra. If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
#include <stdio.h>
#include <assert.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
+#if HAVE_PERL
+ grs_add_handler (h, recTypeGrs_perl);
+#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;
{
index_termlist (n, n, p, level, wrd);
/* index start tag */
+ assert (n->root->u.root.absyn);
+
if (!n->root->u.root.absyn)
index_xpath (n, p, level, wrd, 1);
+ else if (n->root->u.root.absyn->enable_xpath_indexing)
+ index_xpath (n, p, level, wrd, 1);
}
if (n->child)
{
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);
index_termlist (par, n, p, level, wrd);
if (!n->root->u.root.absyn)
index_xpath (n, p, level, wrd, 1016);
-
+ else if (n->root->u.root.absyn->enable_xpath_indexing)
+ index_xpath (n, p, level, wrd, 1016);
}
if (n->which == DATA1N_tag)
/* index end tag */
if (!n->root->u.root.absyn)
index_xpath (n, p, level, wrd, 2);
+ else if (n->root->u.root.absyn->enable_xpath_indexing)
+ index_xpath (n, p, level, wrd, 2);
}
-
if (p->flagShowRecords && n->which == DATA1N_root)
{
printf("%*s-------------\n\n", level * 4, "");
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)
int res, selected = 0;
NMEM mem;
struct grs_read_info gri;
- char *tagname;
+ const char *tagname;
struct grs_handlers *h = (struct grs_handlers *) clientData;
int requested_schema = VAL_NONE;
data1_marctab *marctab;
top = data1_get_root_tag (p->dh, node);
logf (LOG_DEBUG, "grs_retrieve: size");
- if ((dnew = data1_mk_tag_data_wd(p->dh, top, "size", mem)))
+ tagname = data1_systag_lookup(node->u.root.absyn, "size", "size");
+ if (tagname &&
+ (dnew = data1_mk_tag_data_wd(p->dh, top, tagname, mem)))
{
dnew->u.data.what = DATA1I_text;
dnew->u.data.data = dnew->lbuf;
sprintf(dnew->u.data.data, "%d", p->recordSize);
dnew->u.data.len = strlen(dnew->u.data.data);
}
-
- tagname = res_get_def(p->res, "tagrank", "rank");
- if (strcmp(tagname, "0") && p->score >= 0 &&
+
+ tagname = data1_systag_lookup(node->u.root.absyn, "rank", "rank");
+ if (tagname && p->score >= 0 &&
(dnew = data1_mk_tag_data_wd(p->dh, top, tagname, mem)))
{
logf (LOG_DEBUG, "grs_retrieve: %s", tagname);
dnew->u.data.len = strlen(dnew->u.data.data);
}
- tagname = res_get_def(p->res, "tagsysno", "localControlNumber");
- if (strcmp(tagname, "0") && p->localno > 0 &&
- (dnew = data1_mk_tag_data_wd(p->dh, top, tagname, mem)))
+ tagname = data1_systag_lookup(node->u.root.absyn, "sysno",
+ "localControlNumber");
+ if (tagname && p->localno > 0 &&
+ (dnew = data1_mk_tag_data_wd(p->dh, top, tagname, mem)))
{
logf (LOG_DEBUG, "grs_retrieve: %s", tagname);
dnew->u.data.what = DATA1I_text;
dnew->u.data.data = dnew->lbuf;
-
+
sprintf(dnew->u.data.data, "%d", p->localno);
dnew->u.data.len = strlen(dnew->u.data.data);
}
sprintf(p, "%d", *ii);
p += strlen(p);
}
- *(p++) = '\0';
-
- if ((dnew = data1_mk_tag_data_wd(dh, node,
+ if ((dnew = data1_mk_tag_data_wd(dh, top,
"schemaIdentifier", mem)))
{
dnew->u.data.what = DATA1I_oid;
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");
projects / idzebra-moved-to-github.git / blobdiff