X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Frecgrs.c;h=0b7feea2a0cc2dd4504c885d266164481091b3fb;hb=5260b5390d8a1a36c66e52083e8ebb9d26b49f01;hp=9b07e1355f1ce2d455f5dc37c146fb11639191f1;hpb=ec5e593725d0d141d2005c3fc11207bde70912e0;p=idzebra-moved-to-github.git

diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c
index 9b07e13..0b7feea 100644
--- a/recctrl/recgrs.c
+++ b/recctrl/recgrs.c
@@ -4,7 +4,17 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recgrs.c,v $
- * Revision 1.18  1998-03-05 08:41:31  adam
+ * 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
  * Minor changes.
  *
  * Revision 1.17  1998/02/10 12:03:06  adam
@@ -162,8 +172,6 @@
 
 #define GRS_MAX_WORD 512
 
-static int seqno = 0;
-
 static data1_node *read_grs_type (struct grs_read_info *p, const char *type)
 {
     static struct {
@@ -291,13 +299,11 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level)
 		else
 		{
 		    wrd.reg_type = *tlist->structure;
-		    wrd.seqno = seqno;
 		    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);
-		    seqno = wrd.seqno;
+		    (*p->addWord)(&wrd);
 		}
 	    }
 	}
@@ -309,12 +315,28 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level)
     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;
-    seqno = 0;
+    oident oe;
+    int oidtmp[OID_SIZE];
 
     mem = nmem_create (); 
     gri.readf = p->readf;
@@ -329,6 +351,13 @@ static int grs_extract(struct recExtractCtrl *p)
     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);
@@ -463,7 +492,7 @@ static int grs_retrieve(struct recRetrieveCtrl *p)
     }
 
     logf (LOG_DEBUG, "grs_retrieve: localControlNumber");
-    if ((dnew = data1_insert_taggeddata(p->dh, node, node,
+    if (p->localno > 0 && (dnew = data1_insert_taggeddata(p->dh, node, node,
 				       "localControlNumber", mem)))
     {
 	dnew->u.data.what = DATA1I_text;