/*
- * Copyright (C) 1994-1998, Index Data I/S
+ * Copyright (C) 1994-1999, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: recgrs.c,v $
- * Revision 1.19 1998-03-11 11:19:05 adam
+ * Revision 1.26 1999-03-02 16:15:44 quinn
+ * Added "tagsysno" and "tagrank" directives to zebra.cfg.
+ *
+ * Revision 1.25 1999/02/18 15:01:26 adam
+ * Minor changes.
+ *
+ * Revision 1.24 1999/02/02 14:51:28 adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.23 1998/10/18 07:51:10 adam
+ * Changed one logf call.
+ *
+ * Revision 1.22 1998/10/16 08:14:37 adam
+ * Updated record control system.
+ *
+ * Revision 1.21 1998/07/01 09:16:10 adam
+ * Element localno only added when it's greater than 0.
+ *
+ * Revision 1.20 1998/05/20 10:12:26 adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.19 1998/03/11 11:19:05 adam
* Changed the way sequence numbers are generated.
*
* Revision 1.18 1998/03/05 08:41:31 adam
#include <stdio.h>
#include <assert.h>
#include <sys/types.h>
-#ifndef WINDOWS
+#ifndef WIN32
#include <unistd.h>
#endif
return NULL;
}
-static void grs_init(void)
+static void grs_init(RecType recType)
+{
+}
+
+static void grs_destroy(RecType recType)
{
}
wrd.reg_type = *tlist->structure;
wrd.string = n->u.data.data;
wrd.length = n->u.data.len;
- wrd.attrSet = tlist->att->parent->ordinal;
+ wrd.attrSet = (int) (tlist->att->parent->reference);
wrd.attrUse = tlist->att->locals->local;
- (*p->add)(&wrd);
+ (*p->addWord)(&wrd);
}
}
}
return 0;
}
+int grs_extract_tree(struct recExtractCtrl *p, data1_node *n)
+{
+ oident oe;
+ int oidtmp[OID_SIZE];
+
+ oe.proto = PROTO_Z3950;
+ oe.oclass = CLASS_SCHEMA;
+ oe.value = n->u.root.absyn->reference;
+
+ if ((oid_ent_to_oid (&oe, oidtmp)))
+ (*p->addSchema)(p, oidtmp);
+
+ return dumpkeys(n, p, 0);
+}
+
static int grs_extract(struct recExtractCtrl *p)
{
data1_node *n;
NMEM mem;
struct grs_read_info gri;
+ oident oe;
+ int oidtmp[OID_SIZE];
mem = nmem_create ();
gri.readf = p->readf;
n = read_grs_type (&gri, p->subType);
if (!n)
return -1;
+
+ oe.proto = PROTO_Z3950;
+ oe.oclass = CLASS_SCHEMA;
+ oe.value = n->u.root.absyn->reference;
+ if ((oid_ent_to_oid (&oe, oidtmp)))
+ (*p->addSchema)(p, oidtmp);
+
if (dumpkeys(n, p, 0) < 0)
{
data1_free_tree(p->dh, n);
}
if (espec)
{
- logf (LOG_LOG, "Element: Espec-1 match");
+ logf (LOG_DEBUG, "Element: Espec-1 match");
return data1_doespec1(dh, n, espec);
}
else
int res, selected = 0;
NMEM mem;
struct grs_read_info gri;
+ char *tagname;
mem = nmem_create();
gri.readf = p->readf;
dnew->u.data.len = strlen(dnew->u.data.data);
}
- logf (LOG_DEBUG, "grs_retrieve: score");
- if (p->score >= 0 && (dnew =
+ tagname = res_get_def(p->res, "tagrank", "rank");
+ if (strcmp(tagname, "0") && p->score >= 0 && (dnew =
data1_insert_taggeddata(p->dh, node,
- node, "rank",
+ node, tagname,
mem)))
{
+ logf (LOG_DEBUG, "grs_retrieve: %s", tagname);
dnew->u.data.what = DATA1I_num;
dnew->u.data.data = dnew->lbuf;
sprintf(dnew->u.data.data, "%d", p->score);
dnew->u.data.len = strlen(dnew->u.data.data);
}
- logf (LOG_DEBUG, "grs_retrieve: localControlNumber");
- if ((dnew = data1_insert_taggeddata(p->dh, node, node,
- "localControlNumber", mem)))
+ tagname = res_get_def(p->res, "tagsysno", "localControlNumber");
+ if (strcmp(tagname, "0") && p->localno > 0 &&
+ (dnew = data1_insert_taggeddata(p->dh, node, node, 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);
if (!(p->rec_buf = data1_nodetobuf(p->dh, node, selected,
(int*)&p->rec_len)))
p->diagnostic = 238;
+ else
+ {
+ char *new_buf = (char*) odr_malloc (p->odr, p->rec_len);
+ memcpy (new_buf, p->rec_buf, p->rec_len);
+ p->rec_buf = new_buf;
+ }
break;
case VAL_SOIF:
if (!(p->rec_buf = data1_nodetosoif(p->dh, node, selected,
(int*)&p->rec_len)))
p->diagnostic = 238;
+ else
+ {
+ char *new_buf = (char*) odr_malloc (p->odr, p->rec_len);
+ memcpy (new_buf, p->rec_buf, p->rec_len);
+ p->rec_buf = new_buf;
+ }
break;
default:
if (!node->u.root.absyn)
if (!(p->rec_buf = data1_nodetomarc(p->dh, marctab, node,
selected,
(int*)&p->rec_len)))
- {
p->diagnostic = 238;
- break;
+ else
+ {
+ char *new_buf = (char*) odr_malloc (p->odr, p->rec_len);
+ memcpy (new_buf, p->rec_buf, p->rec_len);
+ p->rec_buf = new_buf;
}
}
if (node)
{
"grs",
grs_init,
+ grs_destroy,
grs_extract,
grs_retrieve
};