Fix term counters to be of type zint. Fix several printfs of zint.
[idzebra-moved-to-github.git] / recctrl / recgrs.c
index 4f3ab50..d0774b0 100644 (file)
@@ -1,5 +1,5 @@
-/* $Id: recgrs.c,v 1.71 2002-12-16 20:27:18 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: recgrs.c,v 1.87 2004-08-06 12:55:03 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -62,7 +62,8 @@ static int read_grs_type (struct grs_handlers *h,
         strcpy (p->type, cp+1);
     for (gh = h->handlers; gh; gh = gh->next)
     {
-        if (!memcmp (type, gh->type->type, cp-type))
+        if (!memcmp (type, gh->type->type, cp-type) && 
+           gh->type->type[cp-type] == '\0')
        {
            if (!gh->initFlag)
            {
@@ -99,12 +100,14 @@ static void *grs_init(RecType recType)
     grs_add_handler (h, recTypeGrs_tcl);
 #endif
     grs_add_handler (h, recTypeGrs_marc);
+    grs_add_handler (h, recTypeGrs_marcxml);
 #if HAVE_EXPAT_H
     grs_add_handler (h, recTypeGrs_xml);
 #endif
 #if HAVE_PERL
     grs_add_handler (h, recTypeGrs_perl);
 #endif
+    grs_add_handler (h, recTypeGrs_danbib);
     return h;
 }
 
@@ -123,24 +126,104 @@ static void grs_destroy(void *clientData)
     xfree (h);
 }
 
+int d1_check_xpath_predicate(data1_node *n, struct xpath_predicate *p)
+{
+    int res = 1;
+    char *attname;
+    data1_xattr *attr;
+    
+    if (!p) {
+        return 1;
+    } else {
+        if (p->which == XPATH_PREDICATE_RELATION) {
+            if (p->u.relation.name[0]) {
+                if (*p->u.relation.name != '@') {
+                    yaz_log(LOG_WARN, 
+                         "  Only attributes (@) are supported in xelm xpath predicates");
+                    yaz_log(LOG_WARN, "predicate %s ignored", p->u.relation.name);
+                    return (1);
+                }
+                attname = p->u.relation.name + 1;
+                res = 0;
+                /* looking for the attribute with a specified name */
+                for (attr = n->u.tag.attributes; attr; attr = attr->next) {
+                    yaz_log(LOG_DEBUG,"  - attribute %s <-> %s", attname, attr->name );
+                    
+                    if (!strcmp(attr->name, attname)) {
+                        if (p->u.relation.op[0]) {
+                            if (*p->u.relation.op != '=') {
+                                yaz_log(LOG_WARN, 
+                                     "Only '=' relation is supported (%s)",p->u.relation.op);
+                                yaz_log(LOG_WARN, "predicate %s ignored", p->u.relation.name);
+                                res = 1; break;
+                            } else {
+                                yaz_log(LOG_DEBUG,"    - value %s <-> %s", 
+                                     p->u.relation.value, attr->value );
+                                if (!strcmp(attr->value, p->u.relation.value)) {
+                                    res = 1; break;
+                                } 
+                            }
+                        } else {
+                            /* attribute exists, no value specified */
+                            res = 1; break;
+                        }
+                    }
+                }
+               yaz_log(LOG_DEBUG, "return %d", res);
+                return res;
+            } else {
+                return 1;
+            }
+        } 
+        else if (p->which == XPATH_PREDICATE_BOOLEAN) {
+            if (!strcmp(p->u.boolean.op,"and")) {
+                return d1_check_xpath_predicate(n, p->u.boolean.left) 
+                    && d1_check_xpath_predicate(n, p->u.boolean.right); 
+            }
+            else if (!strcmp(p->u.boolean.op,"or")) {
+                return (d1_check_xpath_predicate(n, p->u.boolean.left) 
+                        || d1_check_xpath_predicate(n, p->u.boolean.right)); 
+            } else {
+                yaz_log(LOG_WARN, "Unknown boolean relation %s, ignored",p->u.boolean.op);
+                return 1;
+            }
+        }
+    }
+    return 0;
+}
+
+
 /* *ostrich*
    
-   New function, looking for xpath "element" definitions in abs, by
-   tagpath, using a kind of ugly regxp search.The DFA was built while
-   parsing abs, so here we just go trough them and try to match
-   against the given tagpath. The first matching entry is returned.
+New function, looking for xpath "element" definitions in abs, by
+tagpath, using a kind of ugly regxp search.The DFA was built while
+parsing abs, so here we just go trough them and try to match
+against the given tagpath. The first matching entry is returned.
 
-   pop, 2002-12-13
- */
+pop, 2002-12-13
+
+Added support for enhanced xelm. Now [] predicates are considered
+as well, when selecting indexing rules... (why the hell it's called
+termlist???)
+
+pop, 2003-01-17
+
+*/
 
 data1_termlist *xpath_termlist_by_tagpath(char *tagpath, data1_node *n)
 {
     data1_absyn *abs = n->root->u.root.absyn;
     data1_xpelement *xpe = abs->xp_elements;
-    char *pexpr = malloc(strlen(tagpath)+2);
+    data1_node *nn;
+#ifdef ENHANCED_XELM 
+    struct xpath_location_step *xp;
+
+#endif
+    char *pexpr = xmalloc(strlen(tagpath)+2);
     int ok = 0;
     
     sprintf (pexpr, "%s\n", tagpath);
+    yaz_log(LOG_DEBUG,"Checking tagpath %s",tagpath);
     while (xpe) 
     {
         struct DFA_state **dfaar = xpe->dfa->states;
@@ -150,9 +233,9 @@ data1_termlist *xpath_termlist_by_tagpath(char *tagpath, data1_node *n)
         int i;
         unsigned char c;
         int start_line = 1;
-        
+
         c = *pexpr++; t = s->trans; i = s->tran_no;
-        if (c >= t->ch[0] && c <= t->ch[1]) {
+       if ((c >= t->ch[0] && c <= t->ch[1]) || (!t->ch[0])) {
             p = pexpr;
             do {
                 if ((s = dfaar[t->to])->rule_no && 
@@ -166,13 +249,52 @@ data1_termlist *xpath_termlist_by_tagpath(char *tagpath, data1_node *n)
                 }
                 p++;
             } while (i >= 0);
-        }
+       }
+       if (ok)
+           yaz_log(LOG_DEBUG," xpath match %s",xpe->xpath_expr);
+       else
+           yaz_log(LOG_DEBUG," xpath no match %s",xpe->xpath_expr);
+
         pexpr--;
-        if (ok) break;
+        if (ok) {
+#ifdef ENHANCED_XELM 
+            /* we have to check the perdicates up to the root node */
+            xp = xpe->xpath;
+            
+            /* find the first tag up in the node structure */
+            nn = n; while (nn && nn->which != DATA1N_tag) {
+                nn = nn->parent;
+            }
+            
+            /* go from inside out in the node structure, while going
+               backwards trough xpath location steps ... */
+            for (i=xpe->xpath_len - 1; i>0; i--) {
+                
+                yaz_log(LOG_DEBUG,"Checking step %d: %s on tag %s",
+                    i,xp[i].part,nn->u.tag.tag);
+                
+                if (!d1_check_xpath_predicate(nn, xp[i].predicate)) {
+                    yaz_log(LOG_DEBUG,"  Predicates didn't match");
+                    ok = 0;
+                    break;
+                }
+                
+                if (nn->which == DATA1N_tag) {
+                    nn = nn->parent;
+                }
+            }
+#endif
+            if (ok) {
+                break;
+            }
+       }
         xpe = xpe->next;
     } 
     
+    xfree(pexpr);
+    
     if (ok) {
+      yaz_log(LOG_DEBUG,"Got it");
         return xpe->termlists;
     } else {
         return NULL;
@@ -197,6 +319,34 @@ data1_termlist *xpath_termlist_by_tagpath(char *tagpath, data1_node *n)
   modified by pop, 2002-12-13
 */
 
+/* add xpath index for an attribute */
+static void index_xpath_attr (char *tag_path, char *name, char *value,
+                             char *structure, struct recExtractCtrl *p,
+                             RecWord *wrd)
+{
+    wrd->attrSet = VAL_IDXPATH;
+    wrd->attrUse = 1;
+    wrd->reg_type = '0';
+    wrd->string = tag_path;
+    wrd->length = strlen(tag_path);
+    (*p->tokenAdd)(wrd);
+    
+    if (value) {
+        wrd->attrUse = 1015;
+        wrd->reg_type = 'w';
+        wrd->string = value;
+        wrd->length = strlen(value);
+        (*p->tokenAdd)(wrd);
+    }
+    
+    wrd->attrUse = 2;
+    wrd->reg_type = '0';
+    wrd->string = tag_path;
+    wrd->length = strlen(tag_path);
+    (*p->tokenAdd)(wrd);
+}
+
+
 static void index_xpath (data1_node *n, struct recExtractCtrl *p,
                          int level, RecWord *wrd, int use)
 {
@@ -204,6 +354,13 @@ static void index_xpath (data1_node *n, struct recExtractCtrl *p,
     char tag_path_full[1024];
     size_t flen = 0;
     data1_node *nn;
+    int termlist_only = 1;
+
+    yaz_log(LOG_DEBUG, "index_xpath level=%d use=%d", level, use);
+    if ((!n->root->u.root.absyn) ||
+       (n->root->u.root.absyn->enable_xpath_indexing)) {
+      termlist_only = 0;
+    }
 
     switch (n->which)
     {
@@ -212,10 +369,10 @@ static void index_xpath (data1_node *n, struct recExtractCtrl *p,
         wrd->length = n->u.data.len;
         if (p->flagShowRecords)
         {
-            printf("%*s data=", (level + 1) * 4, "");
+            printf("%*s XData:\"", (level + 1) * 4, "");
             for (i = 0; i<wrd->length && i < 8; i++)
                 fputc (wrd->string[i], stdout);
-            printf("\n");
+            printf("\"\n");
         }  
         else  {
             data1_termlist *tl;
@@ -237,7 +394,7 @@ static void index_xpath (data1_node *n, struct recExtractCtrl *p,
             tag_path_full[flen] = 0;
             
             /* If we have a matching termlist... */
-            if (tl = xpath_termlist_by_tagpath(tag_path_full, n)) {
+            if (n->root->u.root.absyn && (tl = xpath_termlist_by_tagpath(tag_path_full, n))) {
                 for (; tl; tl = tl->next) {
                     wrd->reg_type = *tl->structure;
                     /* this is the ! case, so structure is for the xpath index */
@@ -246,8 +403,8 @@ static void index_xpath (data1_node *n, struct recExtractCtrl *p,
                         wrd->attrUse = use;
                         (*p->tokenAdd)(wrd);
                         xpdone = 1;
-                        /* this is just the old fashioned attribute based index */
                     } else {
+                        /* this is just the old fashioned attribute based index */
                         wrd->attrSet = (int) (tl->att->parent->reference);
                         wrd->attrUse = tl->att->locals->local;
                         (*p->tokenAdd)(wrd);
@@ -255,14 +412,14 @@ static void index_xpath (data1_node *n, struct recExtractCtrl *p,
                 }
             }
             /* xpath indexing is done, if there was no termlist given, 
-               or no ! attribute... */
-            if (!xpdone) {
+               or no ! in the termlist, and default indexing is enabled... */
+            if ((!xpdone) && (!termlist_only)) {
                 wrd->attrSet = VAL_IDXPATH;
                 wrd->attrUse = use;
                 wrd->reg_type = 'w';
                 (*p->tokenAdd)(wrd);
             }
-        }
+       }
         break;
     case DATA1N_tag:
         flen = 0;
@@ -299,95 +456,137 @@ static void index_xpath (data1_node *n, struct recExtractCtrl *p,
         else
         {
             data1_xattr *xp;
-            (*p->tokenAdd)(wrd);   /* index element pag (AKA tag path) */
-            if (use == 1)
+            data1_termlist *tl;
+           int do_xpindex;
+            
+           tag_path_full[flen] = 0;
+            
+            /* Add tag start/end xpath index, only when there is a ! in the apropriate xelm
+               directive, or default xpath indexing is enabled */
+           if (!(do_xpindex = 1 - termlist_only)) {
+                if ((tl = xpath_termlist_by_tagpath(tag_path_full, n))) {
+                    for (; tl; tl = tl->next) { if (!tl->att) {do_xpindex = 1;} }
+                }
+           }
+           if (do_xpindex) {
+                (*p->tokenAdd)(wrd);   /* index element pag (AKA tag path) */
+           }
+            
+            if (use == 1) /* only for the starting tag... */
             {
-                for (xp = n->u.tag.attributes; xp; xp = xp->next)
-                {
+#define MAX_ATTR_COUNT 50
+                data1_termlist *tll[MAX_ATTR_COUNT];
+                
+                int i = 0;
+                
+                /* get termlists for attributes, and find out, if we have to do xpath indexing */
+                for (xp = n->u.tag.attributes; xp; xp = xp->next) {
+                    i++;
+                }
+                
+                i = 0;
+                for (xp = n->u.tag.attributes; xp; xp = xp->next) {
                     char comb[512];
-                    /* attribute  (no value) */
-                    wrd->reg_type = '0';
-                    wrd->attrUse = 3;
-                    wrd->string = xp->name;
-                    wrd->length = strlen(xp->name);
+                    int do_xpindex = 1 - termlist_only;
+                    data1_termlist *tl;
+                    char attr_tag_path_full[1024]; 
+                    int int_len = flen;
                     
-                    wrd->seqno--;
-                    (*p->tokenAdd)(wrd);
-
-                    if (xp->value &&
-                        strlen(xp->name) + strlen(xp->value) < sizeof(comb)-2)
+                    /* this could be cached as well */
+                    sprintf (attr_tag_path_full, "@%s/%.*s",
+                             xp->name, int_len, tag_path_full);
+                    
+                    tll[i] = xpath_termlist_by_tagpath(attr_tag_path_full,n);
+                    
+                    /* if there is a ! in the xelm termlist, or default indexing is on, 
+                       proceed with xpath idx */
+                    if ((tl = tll[i]))
                     {
-                        /* attribute value exact */
-                        strcpy (comb, xp->name);
-                        strcat (comb, "=");
-                        strcat (comb, xp->value);
+                        for (; tl; tl = tl->next)
+                        { 
+                            if (!tl->att)
+                                do_xpindex = 1;
+                        }
+                    }
+                    
+                    if (do_xpindex) {
                         
-                        wrd->attrUse = 3;
+                        /* attribute  (no value) */
                         wrd->reg_type = '0';
-                        wrd->string = comb;
-                        wrd->length = strlen(comb);
-                        wrd->seqno--;
+                        wrd->attrUse = 3;
+                        wrd->string = xp->name;
+                        wrd->length = strlen(xp->name);
                         
+                        wrd->seqno--;
                         (*p->tokenAdd)(wrd);
-                    }
-                }                
-                for (xp = n->u.tag.attributes; xp; xp = xp->next)
-                {
+                        
+                        if (xp->value &&
+                            strlen(xp->name) + strlen(xp->value) < sizeof(comb)-2) {
+                            
+                            /* attribute value exact */
+                            strcpy (comb, xp->name);
+                            strcat (comb, "=");
+                            strcat (comb, xp->value);
+                            
+                            wrd->attrUse = 3;
+                            wrd->reg_type = '0';
+                            wrd->string = comb;
+                            wrd->length = strlen(comb);
+                            wrd->seqno--;
+                            
+                            (*p->tokenAdd)(wrd);
+                        }
+                    }                
+                    i++;
+                }
+                
+                i = 0;
+                for (xp = n->u.tag.attributes; xp; xp = xp->next) {
+                    data1_termlist *tl;
                     char attr_tag_path_full[1024];
                     int int_len = flen;
+                    int xpdone = 0;
                     
                     sprintf (attr_tag_path_full, "@%s/%.*s",
                              xp->name, int_len, tag_path_full);
-                    wrd->reg_type = '0';
-                    wrd->attrUse = 1;
-                    wrd->string = attr_tag_path_full;
-                    wrd->length = strlen(attr_tag_path_full);
-                    (*p->tokenAdd)(wrd);
                     
-                   if (xp->value)
-                   {
-                        /* the same jokes, as with the data nodes ... */
-                        data1_termlist *tl;
-                        int xpdone = 0;
-                        
-                        wrd->string = xp->value;
-                        wrd->length = strlen(xp->value);
-                        wrd->reg_type = 'w';
-                        
-                        if (tl = xpath_termlist_by_tagpath(attr_tag_path_full,
-                                                           n)) {
-                            for (; tl; tl = tl->next) {
-                                wrd->reg_type = *tl->structure;
-                                if (!tl->att) {
-                                    wrd->attrSet = VAL_IDXPATH;
-                                    wrd->attrUse = 1015;
-                                    (*p->tokenAdd)(wrd);
-                                    xpdone = 1;
-                                } else {
-                                    wrd->attrSet = (int) (tl->att->parent->reference);
+                    if ((tl = tll[i]))
+                    {
+                        /* If there is a termlist given (=xelm directive) */
+                        for (; tl; tl = tl->next)
+                        {
+                            if (!tl->att) {
+                                /* add xpath index for the attribute */
+                                index_xpath_attr (attr_tag_path_full, xp->name,
+                                                  xp->value, tl->structure,
+                                                  p, wrd);
+                                xpdone = 1;
+                            } else {
+                                /* add attribute based index for the attribute */
+                                if (xp->value) {
+                                    wrd->attrSet = (int) 
+                                        (tl->att->parent->reference);
                                     wrd->attrUse = tl->att->locals->local;
+                                    wrd->reg_type = *tl->structure;
+                                    wrd->string = xp->value;
+                                    wrd->length = strlen(xp->value);
                                     (*p->tokenAdd)(wrd);
                                 }
                             }
-                            
-                        } 
-                        if (!xpdone) {
-                            wrd->attrSet = VAL_IDXPATH;
-                            wrd->attrUse = 1015;
-                            wrd->reg_type = 'w';
-                            (*p->tokenAdd)(wrd);
                         }
                     }
-                    
-                   wrd->attrSet = VAL_IDXPATH;
-                    wrd->reg_type = '0';
-                    wrd->attrUse = 2;
-                    wrd->string = attr_tag_path_full;
-                    wrd->length = strlen(attr_tag_path_full);
-                    (*p->tokenAdd)(wrd);
+                    /* if there was no termlist for the given path, 
+                       or the termlist didn't have a ! element, index 
+                       the attribute as "w" */
+                    if ((!xpdone) && (!termlist_only))
+                    {
+                        index_xpath_attr (attr_tag_path_full, xp->name,
+                                          xp->value,  "w", p, wrd);
+                    }
+                    i++;
                 }
             }
-        }
+       }
     }
 }
 
@@ -451,11 +650,11 @@ static void index_termlist (data1_node *par, data1_node *n,
                       tlist->att->parent->name,
                       tlist->att->name, tlist->att->value,
                       tlist->source);
-               printf (" data=\"");
-               for (i = 0; i<wrd->length && i < 8; i++)
+               printf (" XData:\"");
+               for (i = 0; i<wrd->length && i < 40; i++)
                    fputc (wrd->string[i], stdout);
                fputc ('"', stdout);
-               if (wrd->length > 8)
+               if (wrd->length > 40)
                    printf (" ...");
                fputc ('\n', stdout);
            }
@@ -516,13 +715,9 @@ 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->root->u.root.absyn)
+               index_xpath (n, p, level, wrd, 1);
+       }
 
        if (n->child)
            if (dumpkeys(n->child, p, level + 1, wrd) < 0)
@@ -538,8 +733,8 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level,
                printf("%*s", level * 4, "");
                printf("Data: ");
                if (n->u.data.len > 256)
-                   printf("'%.240s ... %.6s'\n", n->u.data.data,
-                          n->u.data.data + n->u.data.len-6);
+                   printf("'%.170s ... %.70s'\n", n->u.data.data,
+                          n->u.data.data + n->u.data.len-70);
                else if (n->u.data.len > 0)
                    printf("'%.*s'\n", n->u.data.len, n->u.data.data);
                else
@@ -548,19 +743,14 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level,
 
            if (par)
                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);
+
+           index_xpath (n, p, level, wrd, 1016);
        }
 
        if (n->which == DATA1N_tag)
        {
             /* 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);
+           index_xpath (n, p, level, wrd, 2);
        }
 
        if (p->flagShowRecords && n->which == DATA1N_root)
@@ -625,6 +815,7 @@ static int grs_extract_sub(struct grs_handlers *h, struct recExtractCtrl *p,
         if ((oid_ent_to_oid (&oe, oidtmp)))
             (*p->schemaAdd)(p, oidtmp);
     }
+    data1_concat_text(p->dh, mem, n);
 
     /* ensure our data1 tree is UTF-8 */
     data1_iconv (p->dh, mem, n, "UTF-8", data1_get_encoding(p->dh, n));
@@ -671,10 +862,10 @@ static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c)
        if (!(eset = data1_getesetbyname(dh, n->u.root.absyn,
                                         c->u.simple->u.generic)))
        {
-           logf(LOG_LOG, "Unknown esetname '%s'", c->u.simple->u.generic);
+           yaz_log(LOG_LOG, "Unknown esetname '%s'", c->u.simple->u.generic);
            return 25; /* invalid esetname */
        }
-       logf(LOG_DEBUG, "Esetname '%s' in simple compspec",
+       yaz_log(LOG_DEBUG, "Esetname '%s' in simple compspec",
             c->u.simple->u.generic);
        espec = eset->spec;
        break;
@@ -691,23 +882,23 @@ static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c)
                          data1_getesetbyname(dh, n->u.root.absyn,
                                              p->u.elementSetName)))
                    {
-                       logf(LOG_LOG, "Unknown esetname '%s'",
+                       yaz_log(LOG_LOG, "Unknown esetname '%s'",
                             p->u.elementSetName);
                        return 25; /* invalid esetname */
                    }
-                   logf(LOG_DEBUG, "Esetname '%s' in complex compspec",
+                   yaz_log(LOG_DEBUG, "Esetname '%s' in complex compspec",
                         p->u.elementSetName);
                    espec = eset->spec;
                    break;
                case Z_ElementSpec_externalSpec:
                    if (p->u.externalSpec->which == Z_External_espec1)
                    {
-                       logf(LOG_DEBUG, "Got Espec-1");
+                       yaz_log(LOG_DEBUG, "Got Espec-1");
                        espec = p->u.externalSpec-> u.espec1;
                    }
                    else
                    {
-                       logf(LOG_LOG, "Unknown external espec.");
+                       yaz_log(LOG_LOG, "Unknown external espec.");
                        return 25; /* bad. what is proper diagnostic? */
                    }
                    break;
@@ -719,12 +910,12 @@ static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c)
     }
     if (espec)
     {
-        logf (LOG_DEBUG, "Element: Espec-1 match");
+        yaz_log(LOG_DEBUG, "Element: Espec-1 match");
        return data1_doespec1(dh, n, espec);
     }
     else
     {
-       logf (LOG_DEBUG, "Element: all match");
+       yaz_log(LOG_DEBUG, "Element: all match");
        return -1;
     }
 }
@@ -801,7 +992,7 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
     gri.mem = mem;
     gri.dh = p->dh;
 
-    logf (LOG_DEBUG, "grs_retrieve");
+    yaz_log(LOG_DEBUG, "grs_retrieve");
     if (read_grs_type (h, &gri, p->subType, &node))
     {
        p->diagnostic = 14;
@@ -814,6 +1005,8 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
         nmem_destroy (mem);
        return 0;
     }
+    data1_concat_text(p->dh, mem, node);
+
     /* ensure our data1 tree is UTF-8 */
     data1_iconv (p->dh, mem, node, "UTF-8", data1_get_encoding(p->dh, node));
 
@@ -822,7 +1015,7 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
 #endif
     top = data1_get_root_tag (p->dh, node);
 
-    logf (LOG_DEBUG, "grs_retrieve: size");
+    yaz_log(LOG_DEBUG, "grs_retrieve: size");
     tagname = data1_systag_lookup(node->u.root.absyn, "size", "size");
     if (tagname &&
         (dnew = data1_mk_tag_data_wd(p->dh, top, tagname, mem)))
@@ -837,7 +1030,7 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
     if (tagname && p->score >= 0 &&
        (dnew = data1_mk_tag_data_wd(p->dh, top, tagname, mem)))
     {
-        logf (LOG_DEBUG, "grs_retrieve: %s", tagname);
+        yaz_log(LOG_DEBUG, "grs_retrieve: %s", tagname);
        dnew->u.data.what = DATA1I_num;
        dnew->u.data.data = dnew->lbuf;
        sprintf(dnew->u.data.data, "%d", p->score);
@@ -849,31 +1042,42 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
     if (tagname && p->localno > 0 &&
         (dnew = data1_mk_tag_data_wd(p->dh, top, tagname, mem)))
     {
-        logf (LOG_DEBUG, "grs_retrieve: %s", tagname);
+        yaz_log(LOG_DEBUG, "grs_retrieve: %s", tagname);
        dnew->u.data.what = DATA1I_text;
        dnew->u.data.data = dnew->lbuf;
         
-       sprintf(dnew->u.data.data, "%d", p->localno);
+       sprintf(dnew->u.data.data, ZINT_FORMAT, p->localno);
        dnew->u.data.len = strlen(dnew->u.data.data);
     }
 #if 0
     data1_pr_tree (p->dh, node, stdout);
 #endif
+#if YAZ_VERSIONL >= 0x010903L
     if (p->comp && p->comp->which == Z_RecordComp_complex &&
        p->comp->u.complex->generic &&
-       p->comp->u.complex->generic->schema)
+        p->comp->u.complex->generic->which == Z_Schema_oid &&
+        p->comp->u.complex->generic->schema.oid)
+    {
+       oident *oe = oid_getentbyoid (p->comp->u.complex->generic->schema.oid);
+       if (oe)
+           requested_schema = oe->value;
+    }
+#else
+    if (p->comp && p->comp->which == Z_RecordComp_complex &&
+       p->comp->u.complex->generic && p->comp->u.complex->generic->schema)
     {
        oident *oe = oid_getentbyoid (p->comp->u.complex->generic->schema);
        if (oe)
            requested_schema = oe->value;
     }
+#endif
 
     /* If schema has been specified, map if possible, then check that
      * we got the right one 
      */
     if (requested_schema != VAL_NONE)
     {
-       logf (LOG_DEBUG, "grs_retrieve: schema mapping");
+       yaz_log(LOG_DEBUG, "grs_retrieve: schema mapping");
        for (map = node->u.root.absyn->maptabs; map; map = map->next)
        {
            if (map->target_absyn_ref == requested_schema)
@@ -901,7 +1105,7 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
      * the overlap of schema and formatting which is inherent in the MARC
      * family)
      */
-    yaz_log (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)
         {
@@ -917,7 +1121,7 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
                 break;
             }
         }
-    yaz_log (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)
@@ -955,7 +1159,7 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
        }
     }
 
-    logf (LOG_DEBUG, "grs_retrieve: element spec");
+    yaz_log(LOG_DEBUG, "grs_retrieve: element spec");
     if (p->comp && (res = process_comp(p->dh, node, p->comp)) > 0)
     {
        p->diagnostic = res;
@@ -971,7 +1175,7 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p)
 #if 0
     data1_pr_tree (p->dh, node, stdout);
 #endif
-    logf (LOG_DEBUG, "grs_retrieve: transfer syntax mapping");
+    yaz_log(LOG_DEBUG, "grs_retrieve: transfer syntax mapping");
     switch (p->output_format = (p->input_format != VAL_NONE ?
                                p->input_format : VAL_SUTRS))
     {