Fixed bug regarding user-defined attribute sets.

[idzebra-moved-to-github.git] / recctrl / recgrs.c

diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c
index d937600..8e60bf0 100644 (file)
--- a/recctrl/recgrs.c
+++ b/recctrl/recgrs.c
@@ -1,10 +1,28 @@
 /*
- * Copyright (C) 1994-1999, Index Data
+ * Copyright (C) 1994-2000, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recgrs.c,v $
- * Revision 1.30  1999-07-06 12:26:41  adam
+ * Revision 1.36  2000-12-05 10:01:44  adam
+ * Fixed bug regarding user-defined attribute sets.
+ *
+ * Revision 1.35  2000/11/29 15:21:31  adam
+ * Fixed problem with passwd db.
+ *
+ * Revision 1.34  2000/02/25 13:24:49  adam
+ * Fixed bug regarding pointer conversion that showed up on OSF V5.
+ *
+ * Revision 1.33  1999/11/30 13:48:04  adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.32  1999/09/07 07:19:21  adam
+ * Work on character mapping. Implemented replace rules.
+ *
+ * Revision 1.31  1999/07/14 10:56:43  adam
+ * Fixed potential memory leak.
+ *
+ * Revision 1.30  1999/07/06 12:26:41  adam
  * Retrieval handler obeys schema and handles XML transfer syntax.
  *
  * Revision 1.29  1999/05/26 07:49:14  adam
@@ -191,8 +209,8 @@
 #include <unistd.h>
 #endif
 
-#include <log.h>
-#include <oid.h>
+#include <yaz/log.h>
+#include <yaz/oid.h>
 
 #include <recctrl.h>
 #include "grsread.h"
@@ -379,7 +397,7 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level)
                    wrd.length = n->u.data.len;
                    wrd.attrSet = (int) (tlist->att->parent->reference);
                    wrd.attrUse = tlist->att->locals->local;
-                   (*p->addWord)(&wrd);
+                   (*p->tokenAdd)(&wrd);
                }
            }
        }
@@ -401,21 +419,19 @@ int grs_extract_tree(struct recExtractCtrl *p, data1_node *n)
     oe.value = n->u.root.absyn->reference;
 
     if ((oid_ent_to_oid (&oe, oidtmp)))
-       (*p->addSchema)(p, oidtmp);
+       (*p->schemaAdd)(p, oidtmp);
 
     return dumpkeys(n, p, 0);
 }
 
-static int grs_extract(void *clientData, struct recExtractCtrl *p)
+static int grs_extract_sub(struct grs_handlers *h, struct recExtractCtrl *p,
+                          NMEM mem)
 {
     data1_node *n;
-    NMEM mem;
     struct grs_read_info gri;
     oident oe;
     int oidtmp[OID_SIZE];
-    struct grs_handlers *h = (struct grs_handlers *) clientData;
 
-    mem = nmem_create (); 
     gri.readf = p->readf;
     gri.seekf = p->seekf;
     gri.tellf = p->tellf;
@@ -429,12 +445,11 @@ static int grs_extract(void *clientData, struct recExtractCtrl *p)
        return RECCTRL_EXTRACT_ERROR;
     if (!n)
         return RECCTRL_EXTRACT_EOF;
-
     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);
+       (*p->schemaAdd)(p, oidtmp);
 
     if (dumpkeys(n, p, 0) < 0)
     {
@@ -442,10 +457,20 @@ static int grs_extract(void *clientData, struct recExtractCtrl *p)
        return RECCTRL_EXTRACT_ERROR;
     }
     data1_free_tree(p->dh, n);
-    nmem_destroy(mem);
     return RECCTRL_EXTRACT_OK;
 }
 
+static int grs_extract(void *clientData, struct recExtractCtrl *p)
+{
+    int ret;
+    NMEM mem = nmem_create ();
+    struct grs_handlers *h = (struct grs_handlers *) clientData;
+
+    ret = grs_extract_sub(h, p, mem);
+    nmem_destroy(mem);
+    return ret;
+}
+
 /*
  * Return: -1: Nothing done. 0: Ok. >0: Bib-1 diagnostic.
  */
@@ -464,7 +489,7 @@ static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c)
                                         c->u.simple->u.generic)))
        {
            logf(LOG_LOG, "Unknown esetname '%s'", c->u.simple->u.generic);
-               return 25; /* invalid esetname */
+           return 25; /* invalid esetname */
        }
        logf(LOG_DEBUG, "Esetname '%s' in simple compspec",
             c->u.simple->u.generic);
@@ -556,6 +581,9 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
         nmem_destroy (mem);
        return 0;
     }
+#if 0
+    data1_pr_tree (p->dh, node, stdout);
+#endif
     logf (LOG_DEBUG, "grs_retrieve: size");
     if ((dnew = data1_insert_taggeddata(p->dh, node, node,
                                       "size", mem)))
@@ -707,7 +735,7 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
        
     case VAL_TEXT_XML:
        if (!(p->rec_buf = data1_nodetoidsgml(p->dh, node, selected,
-                                             (int*)&p->rec_len)))
+                                             &p->rec_len)))
            p->diagnostic = 238;
        else
        {
@@ -740,7 +768,7 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
        break;
     case VAL_SUTRS:
        if (!(p->rec_buf = data1_nodetobuf(p->dh, node, selected,
-                                          (int*)&p->rec_len)))
+                                          &p->rec_len)))
            p->diagnostic = 238;
        else
        {
@@ -751,7 +779,7 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
        break;
     case VAL_SOIF:
        if (!(p->rec_buf = data1_nodetosoif(p->dh, node, selected,
-                                           (int*)&p->rec_len)))
+                                           &p->rec_len)))
            p->diagnostic = 238;
        else
        {
@@ -776,8 +804,7 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
            break;
        }
        if (!(p->rec_buf = data1_nodetomarc(p->dh, marctab, node,
-                                               selected,
-                                           (int*)&p->rec_len)))
+                                       selected, &p->rec_len)))
            p->diagnostic = 238;
        else
        {