X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Frecgrs.c;h=1c34c2e72718193962ef3f0de2a09a18e62bf532;hb=eb6f5a00932fd50cb95aca3c1dd5039116254f4b;hp=41b873cf6d3aa6cfe535bdbfaae9522740820098;hpb=5437b50633032595afe6f87dc0f989bc92a5aea8;p=idzebra-moved-to-github.git

diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c
index 41b873c..1c34c2e 100644
--- a/recctrl/recgrs.c
+++ b/recctrl/recgrs.c
@@ -1,4 +1,4 @@
-/* $Id: recgrs.c,v 1.93 2004-11-19 10:27:12 heikki Exp $
+/* $Id: recgrs.c,v 1.95 2004-12-13 20:51:32 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -28,7 +28,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <dlfcn.h>
 #endif
 
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 #include <yaz/oid.h>
 
 #include <d1_absyn.h>
@@ -900,7 +900,8 @@ int zebra_grs_extract(void *clientData, struct recExtractCtrl *p,
 /*
  * Return: -1: Nothing done. 0: Ok. >0: Bib-1 diagnostic.
  */
-static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c)
+static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c,
+			char **addinfo, ODR o)
 {
     data1_esetname *eset;
     Z_Espec1 *espec = 0;
@@ -915,6 +916,7 @@ static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c)
 					 c->u.simple->u.generic)))
 	{
 	    yaz_log(YLOG_LOG, "Unknown esetname '%s'", c->u.simple->u.generic);
+	    *addinfo = odr_strdup(o, c->u.simple->u.generic);
 	    return 25; /* invalid esetname */
 	}
 	yaz_log(YLOG_DEBUG, "Esetname '%s' in simple compspec",
@@ -934,8 +936,9 @@ static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c)
 			  data1_getesetbyname(dh, n->u.root.absyn,
 					      p->u.elementSetName)))
 		    {
-			yaz_log(YLOG_LOG, "Unknown esetname '%s'",
+			yaz_log(YLOG_DEBUG, "Unknown esetname '%s'",
 			     p->u.elementSetName);
+			*addinfo = odr_strdup(o, p->u.elementSetName);
 			return 25; /* invalid esetname */
 		    }
 		    yaz_log(YLOG_DEBUG, "Esetname '%s' in complex compspec",
@@ -1213,7 +1216,8 @@ int zebra_grs_retrieve(void *clientData, struct recRetrieveCtrl *p,
     }
 
     yaz_log(YLOG_DEBUG, "grs_retrieve: element spec");
-    if (p->comp && (res = process_comp(p->dh, node, p->comp)) > 0)
+    if (p->comp && (res = process_comp(p->dh, node, p->comp, &p->addinfo,
+				       p->odr)) > 0)
     {
 	p->diagnostic = res;
 	if (onode)