No more @-tag for MARC

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

diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c
index 77ce0ae..e11811b 100644 (file)
--- a/recctrl/recgrs.c
+++ b/recctrl/recgrs.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1994-2002, Index Data
  * All rights reserved.
  *
- * $Id: recgrs.c,v 1.49 2002-05-13 14:13:43 adam Exp $
+ * $Id: recgrs.c,v 1.51 2002-05-28 21:10:34 adam Exp $
  */
 
 #include <stdio.h>
@@ -136,7 +136,7 @@ static void index_xpath (data1_node *n, struct recExtractCtrl *p,
     case DATA1N_tag:
         for (nn = n; nn; nn = nn->parent)
         {
-            if (n->which == DATA1N_tag)
+            if (nn->which == DATA1N_tag)
             {
                 size_t tlen = strlen(nn->u.tag.tag);
                 if (tlen + flen > (sizeof(tag_path_full)-2))
@@ -145,7 +145,7 @@ static void index_xpath (data1_node *n, struct recExtractCtrl *p,
                 flen += tlen;
                 tag_path_full[flen++] = '/';
             }
-            else if (n->which == DATA1N_root)
+            else if (nn->which == DATA1N_root)
             {
                 size_t tlen = strlen(nn->u.root.type);
                 if (tlen + flen > (sizeof(tag_path_full)-2))
@@ -615,7 +615,7 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
      * the overlap of schema and formatting which is inherent in the MARC
      * family)
      */
-    logf (LOG_DEBUG, "grs_retrieve: syntax mapping");
+    yaz_log (LOG_DEBUG, "grs_retrieve: syntax mapping");
     if (node->u.root.absyn)
         for (map = node->u.root.absyn->maptabs; map; map = map->next)
         {
@@ -631,7 +631,7 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
                 break;
             }
         }
-    logf (LOG_DEBUG, "grs_retrieve: schemaIdentifier");
+    yaz_log (LOG_DEBUG, "grs_retrieve: schemaIdentifier");
     if (node->u.root.absyn &&
        node->u.root.absyn->reference != VAL_NONE &&
        p->input_format == VAL_GRS1)