X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Frecgrs.c;h=87e6186e472661e4beda5852ca5f55f8bcd80643;hb=83533000f9456dcab2fc171abafd84d6104d4087;hp=150f4a71657ccfd3366a9f42e0b52954f6144b64;hpb=0af5d3854fbf1ca317b8dc3cf3b478728f6d4d5a;p=idzebra-moved-to-github.git

diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c
index 150f4a7..87e6186 100644
--- a/recctrl/recgrs.c
+++ b/recctrl/recgrs.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recgrs.c,v $
- * Revision 1.31  1999-07-14 10:56:43  adam
+ * 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
@@ -194,8 +203,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"
@@ -382,7 +391,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);
 		}
 	    }
 	}
@@ -404,7 +413,7 @@ 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);
 }
@@ -434,7 +443,7 @@ static int grs_extract_sub(struct grs_handlers *h, struct recExtractCtrl *p,
     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)
     {
@@ -717,7 +726,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
 	{
@@ -750,7 +759,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
 	{
@@ -761,7 +770,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
 	{
@@ -786,8 +795,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
 	{