Switch to DEBUG

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

diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c
index c41906f..5514b2b 100644 (file)
--- a/recctrl/recgrs.c
+++ b/recctrl/recgrs.c
@@ -1,4 +1,4 @@
-/* $Id: recgrs.c,v 1.59 2002-08-02 19:26:56 adam Exp $
+/* $Id: recgrs.c,v 1.63 2002-08-28 19:52:29 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -20,8 +20,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
 #include <stdio.h>
 #include <assert.h>
 #include <sys/types.h>
@@ -101,7 +99,7 @@ static void *grs_init(RecType recType)
     grs_add_handler (h, recTypeGrs_tcl);
 #endif
     grs_add_handler (h, recTypeGrs_marc);
-#if YAZ_HAVE_EXPAT
+#if HAVE_EXPAT_H
     grs_add_handler (h, recTypeGrs_xml);
 #endif
     return h;
@@ -227,9 +225,10 @@ static void index_xpath (data1_node *n, struct recExtractCtrl *p,
                 for (xp = n->u.tag.attributes; xp; xp = xp->next)
                 {
                     char attr_tag_path_full[1024];
+                    int int_len = flen;
                     
                     sprintf (attr_tag_path_full, "@%s/%.*s",
-                             xp->name, flen, tag_path_full);
+                             xp->name, int_len, tag_path_full);
 
                     wrd->reg_type = '0';
                     wrd->attrUse = 1;
@@ -378,8 +377,12 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level,
        {
             index_termlist (n, n, p, level, wrd);
             /* index start tag */
+            assert (n->root->u.root.absyn);
+            
             if (!n->root->u.root.absyn)
                 index_xpath (n, p, level, wrd, 1);
+            else if (n->root->u.root.absyn->enable_xpath_indexing)
+                index_xpath (n, p, level, wrd, 1);
        }
 
        if (n->child)
@@ -395,8 +398,8 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level,
            {
                printf("%*s", level * 4, "");
                printf("Data: ");
-               if (n->u.data.len > 32)
-                   printf("'%.24s ... %.6s'\n", n->u.data.data,
+               if (n->u.data.len > 256)
+                   printf("'%.240s ... %.6s'\n", n->u.data.data,
                           n->u.data.data + n->u.data.len-6);
                else if (n->u.data.len > 0)
                    printf("'%.*s'\n", n->u.data.len, n->u.data.data);
@@ -408,7 +411,8 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level,
                index_termlist (par, n, p, level, wrd);
             if (!n->root->u.root.absyn)
                 index_xpath (n, p, level, wrd, 1016);
-
+            else if (n->root->u.root.absyn->enable_xpath_indexing)
+                index_xpath (n, p, level, wrd, 1016);
        }
 
        if (n->which == DATA1N_tag)
@@ -416,9 +420,10 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level,
             /* index end tag */
             if (!n->root->u.root.absyn)
                 index_xpath (n, p, level, wrd, 2);
+            else if (n->root->u.root.absyn->enable_xpath_indexing)
+                index_xpath (n, p, level, wrd, 2);
        }
 
-
        if (p->flagShowRecords && n->which == DATA1N_root)
        {
            printf("%*s-------------\n\n", level * 4, "");
@@ -466,7 +471,7 @@ static int grs_extract_sub(struct grs_handlers *h, struct recExtractCtrl *p,
     gri.dh = p->dh;
 
     if (read_grs_type (h, &gri, p->subType, &n))
-       return RECCTRL_EXTRACT_ERROR;
+       return RECCTRL_EXTRACT_ERROR_NO_SUCH_FILTER;
     if (!n)
         return RECCTRL_EXTRACT_EOF;
     oe.proto = PROTO_Z3950;
@@ -493,7 +498,7 @@ static int grs_extract_sub(struct grs_handlers *h, struct recExtractCtrl *p,
     if (dumpkeys(n, p, 0, &wrd) < 0)
     {
        data1_free_tree(p->dh, n);
-       return RECCTRL_EXTRACT_ERROR;
+       return RECCTRL_EXTRACT_ERROR_GENERIC;
     }
     data1_free_tree(p->dh, n);
     return RECCTRL_EXTRACT_OK;
@@ -649,7 +654,7 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
     /* ensure our data1 tree is UTF-8 */
     data1_iconv (p->dh, mem, node, "UTF-8", data1_get_encoding(p->dh, node));
 
-#if 0
+#if 1
     data1_pr_tree (p->dh, node, stdout);
 #endif
     top = data1_get_root_tag (p->dh, node);