Disable X-Path indexing for explain records (in the case where

explain.abs is missing). Make extract module log to log level "extract".
Rename buffer_extract_record to zebra_buffer_extract_record.

diff --git a/data1/d1_absyn.c b/data1/d1_absyn.c
index 2879df4..f660485 100644 (file)
--- a/data1/d1_absyn.c
+++ b/data1/d1_absyn.c
@@ -1,4 +1,4 @@
-/* $Id: d1_absyn.c,v 1.26 2006-06-08 10:33:19 adam Exp $
+/* $Id: d1_absyn.c,v 1.27 2006-06-13 12:02:02 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -206,7 +206,11 @@ void data1_absyn_trav (data1_handle dh, void *handle,
     }
 }
 
-data1_absyn *data1_absyn_add (data1_handle dh, const char *name)
+static data1_absyn *data1_read_absyn(data1_handle dh, const char *file,
+                                     enum DATA1_XPATH_INDEXING en);
+
+static data1_absyn *data1_absyn_add(data1_handle dh, const char *name,
+                                    enum DATA1_XPATH_INDEXING en)
 {
     char fname[512];
     NMEM mem = data1_nmem_get (dh);
@@ -214,20 +218,21 @@ data1_absyn *data1_absyn_add (data1_handle dh, const char *name)
     data1_absyn_cache p = (data1_absyn_cache)nmem_malloc (mem, sizeof(*p));
     data1_absyn_cache *pp = data1_absyn_cache_get (dh);
 
-    sprintf(fname, "%s.abs", name);
-    p->absyn = data1_read_absyn (dh, fname, 0);
-    p->name = nmem_strdup (mem, name);
+    sprintf(fname, "%.500s.abs", name);
+    p->absyn = data1_read_absyn(dh, fname, en);
+    p->name = nmem_strdup(mem, name);
     p->next = *pp;
     *pp = p;
     return p->absyn;
 }
 
-data1_absyn *data1_get_absyn (data1_handle dh, const char *name)
+data1_absyn *data1_get_absyn (data1_handle dh, const char *name,
+                              enum DATA1_XPATH_INDEXING en)
 {
     data1_absyn *absyn;
 
     if (!(absyn = data1_absyn_search (dh, name)))
-       absyn = data1_absyn_add (dh, name);
+       absyn = data1_absyn_add (dh, name, en);
     return absyn;
 }
 
@@ -259,20 +264,10 @@ data1_attset *data1_attset_search_id (data1_handle dh, int id)
 
 data1_attset *data1_attset_add (data1_handle dh, const char *name)
 {
-    char fname[512], aname[512];
     NMEM mem = data1_nmem_get (dh);
     data1_attset *attset;
-
-    strcpy (aname, name);
-    sprintf(fname, "%s.att", name);
-    attset = data1_read_attset (dh, fname);
-    if (!attset)
-    {
-       char *cp;
-       attset = data1_read_attset (dh, name);
-       if (attset && (cp = strrchr (aname, '.')))
-           *cp = '\0';
-    }
+    
+    attset = data1_read_attset (dh, name);
     if (!attset)
        yaz_log (YLOG_WARN|YLOG_ERRNO, "Couldn't load attribute set %s", name);
     else
@@ -281,7 +276,7 @@ data1_attset *data1_attset_add (data1_handle dh, const char *name)
            nmem_malloc (mem, sizeof(*p));
        data1_attset_cache *pp = data1_attset_cache_get (dh);
        
-       attset->name = p->name = nmem_strdup (mem, aname);
+       attset->name = p->name = nmem_strdup(mem, name);
        p->attset = attset;
        p->next = *pp;
        *pp = p;
@@ -691,8 +686,8 @@ YAZ_EXPORT data1_element *data1_absyn_getelements(data1_handle dh,
     return absyn->main_elements;
 }
 
-data1_absyn *data1_read_absyn (data1_handle dh, const char *file,
-                               int file_must_exist)
+static data1_absyn *data1_read_absyn(data1_handle dh, const char *file,
+                                     enum DATA1_XPATH_INDEXING default_xpath)
 {
     data1_sub_elements *cur_elements = NULL;
     data1_xpelement *cur_xpelement = NULL;
@@ -713,18 +708,15 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file,
     int argc;
     char *argv[50], line[512];
 
-    if (!(f = data1_path_fopen(dh, file, "r")))
-    {
-        if (file_must_exist)
-            return 0;
-    }
+    f = data1_path_fopen(dh, file, "r");
     
     res = (data1_absyn *) nmem_malloc(data1_nmem_get(dh), sizeof(*res));
     res->name = 0;
     res->reference = VAL_NONE;
     res->tagset = 0;
     res->encoding = 0;
-    res->enable_xpath_indexing = (f ? 0 : 1);
+    res->xpath_indexing = 
+        (f ? DATA1_XPATH_INDEXING_DISABLE : default_xpath);
     res->systags = 0;
     systagsp = &res->systags;
     tagset_childp = &res->tagset;
@@ -977,9 +969,9 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file,
                continue;
             }
             if (!strcmp(argv[1], "enable"))
-                res->enable_xpath_indexing = 1;
+                res->xpath_indexing = DATA1_XPATH_INDEXING_ENABLE;
             else if (!strcmp (argv[1], "disable"))
-                res->enable_xpath_indexing = 0;
+                res->xpath_indexing = DATA1_XPATH_INDEXING_DISABLE;
             else
             {
                yaz_log(YLOG_WARN, "%s:%d: Expecting disable/enable "

diff --git a/data1/d1_map.c b/data1/d1_map.c
index 5bbe680..72ef930 100644 (file)
--- a/data1/d1_map.c
+++ b/data1/d1_map.c
@@ -1,4 +1,4 @@
-/* $Id: d1_map.c,v 1.10 2006-06-08 10:33:19 adam Exp $
+/* $Id: d1_map.c,v 1.11 2006-06-13 12:02:02 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -326,7 +326,8 @@ data1_node *data1_map_record (data1_handle dh, data1_node *n,
 
     res->which = DATA1N_root;
     res->u.root.type = map->target_absyn_name;
-    if (!(res->u.root.absyn = data1_get_absyn(dh, map->target_absyn_name)))
+    if (!(res->u.root.absyn = data1_get_absyn(dh, map->target_absyn_name,
+                                              DATA1_XPATH_INDEXING_ENABLE)))
     {
        yaz_log(YLOG_WARN, "%s: Failed to load target absyn '%s'",
                map->name, map->target_absyn_name);

diff --git a/data1/d1_read.c b/data1/d1_read.c
index f5aa467..c9d92b6 100644 (file)
--- a/data1/d1_read.c
+++ b/data1/d1_read.c
@@ -1,4 +1,4 @@
-/* $Id: d1_read.c,v 1.18 2006-05-10 08:13:18 adam Exp $
+/* $Id: d1_read.c,v 1.19 2006-06-13 12:02:02 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -188,7 +188,7 @@ void data1_free_tree (data1_handle dh, data1_node *t)
 
 data1_node *data1_mk_root (data1_handle dh, NMEM nmem, const char *name)
 {
-    data1_absyn *absyn = data1_get_absyn (dh, name);
+    data1_absyn *absyn = data1_get_absyn(dh, name, 1);
     data1_node *res;
     if (!absyn)
     {
@@ -205,7 +205,8 @@ data1_node *data1_mk_root (data1_handle dh, NMEM nmem, const char *name)
 void data1_set_root(data1_handle dh, data1_node *res,
                     NMEM nmem, const char *name)
 {
-    data1_absyn *absyn = data1_get_absyn (dh, name);
+    data1_absyn *absyn = data1_get_absyn(
+        dh, name, DATA1_XPATH_INDEXING_ENABLE);
 
     res->u.root.type = data1_insert_string (dh, res, nmem, name);
     res->u.root.absyn = absyn;

diff --git a/include/d1_absyn.h b/include/d1_absyn.h
index f7aa6c9..e08a41b 100644 (file)
--- a/include/d1_absyn.h
+++ b/include/d1_absyn.h
@@ -1,4 +1,4 @@
-/* $Id: d1_absyn.h,v 1.4 2006-05-19 13:49:34 adam Exp $
+/* $Id: d1_absyn.h,v 1.5 2006-06-13 12:02:03 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -55,7 +55,7 @@ struct data1_absyn
     struct data1_xpelement *xp_elements; /* pop */
     struct data1_systag *systags;
     char *encoding;
-    int  enable_xpath_indexing;
+    enum DATA1_XPATH_INDEXING xpath_indexing;
 };
 
 #endif

diff --git a/include/idzebra/data1.h b/include/idzebra/data1.h
index 58ac8ca..3f93112 100644 (file)
--- a/include/idzebra/data1.h
+++ b/include/idzebra/data1.h
@@ -1,4 +1,4 @@
-/* $Id: data1.h,v 1.14 2006-05-19 23:45:29 adam Exp $
+/* $Id: data1.h,v 1.15 2006-06-13 12:02:03 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -354,6 +354,11 @@ typedef struct data1_node
     struct data1_node *root;
 } data1_node;
 
+enum DATA1_XPATH_INDEXING {
+    DATA1_XPATH_INDEXING_DISABLE,
+    DATA1_XPATH_INDEXING_ENABLE
+};
+
 YAZ_EXPORT data1_handle data1_create (void);
 
 
@@ -367,8 +372,6 @@ YAZ_EXPORT data1_node *data1_read_nodex (data1_handle dh, NMEM m,
 YAZ_EXPORT data1_node *data1_read_record(data1_handle dh, 
                                         int (*rf)(void *, char *, size_t),
                                         void *fh, NMEM m);
-YAZ_EXPORT data1_absyn *data1_read_absyn(data1_handle dh, const char *file,
-                                         int file_must_exist);
 YAZ_EXPORT data1_tag *data1_gettagbynum(data1_handle dh,
                                        data1_tagset *s,
                                        int type, int value);
@@ -484,7 +487,8 @@ YAZ_EXPORT data1_node *data1_mk_tag_data_text_uni (data1_handle dh,
                                                    const char *str,
                                                    NMEM nmem);
 
-YAZ_EXPORT data1_absyn *data1_get_absyn (data1_handle dh, const char *name);
+YAZ_EXPORT data1_absyn *data1_get_absyn (data1_handle dh, const char *name,
+                                         enum DATA1_XPATH_INDEXING en);
 
 YAZ_EXPORT data1_node *data1_search_tag (data1_handle dh, data1_node *n,
                                          const char *tag);

diff --git a/index/extract.c b/index/extract.c
index 8d4cd9c..8358ade 100644 (file)
--- a/index/extract.c
+++ b/index/extract.c
@@ -1,4 +1,4 @@
-/* $Id: extract.c,v 1.219 2006-06-07 10:14:40 adam Exp $
+/* $Id: extract.c,v 1.220 2006-06-13 12:02:06 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -50,20 +50,31 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #define ENCODE_BUFLEN 768
 struct encode_info {
-#if 0
-    int  sysno;  /* previously written values for delta-compress */
-    int  seqno;
-    int  cmd;
-    int prevsys; /* buffer for skipping insert/delete pairs */
-    int prevseq;
-    int prevcmd;
-    int keylen; /* tells if we have an unwritten key in buf, and how long*/
-#endif
     void *encode_handle;
     void *decode_handle;
     char buf[ENCODE_BUFLEN];
 };
 
+static int log_level = 0;
+static int log_level_initialized = 1;
+
+static void zebra_init_log_level()
+{
+    if (!log_level_initialized)
+    {
+        log_level = yaz_log_module_level("extract");
+        log_level_initialized = 1;
+    }
+}
+
+static void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
+                                     int cmd, zebra_rec_keys_t reckeys,
+                                     zint staticrank);
+static void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
+                                   int cmd, zebra_rec_keys_t skp);
+static void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid);
+static void extract_token_add (RecWord *p);
+
 static void encode_key_init (struct encode_info *i);
 static void encode_key_write (char *k, struct encode_info *i, FILE *outf);
 static void encode_key_flush (struct encode_info *i, FILE *outf);
@@ -100,10 +111,10 @@ static void logRecord (ZebraHandle zh)
     ++zh->records_processed;
     if (!(zh->records_processed % 1000))
     {
-        yaz_log (YLOG_LOG, "Records: "ZINT_FORMAT" i/u/d "
-                       ZINT_FORMAT"/"ZINT_FORMAT"/"ZINT_FORMAT, 
-              zh->records_processed, zh->records_inserted, zh->records_updated,
-              zh->records_deleted);
+        yaz_log(YLOG_LOG, "Records: "ZINT_FORMAT" i/u/d "
+                ZINT_FORMAT"/"ZINT_FORMAT"/"ZINT_FORMAT, 
+                zh->records_processed, zh->records_inserted, 
+                zh->records_updated, zh->records_deleted);
     }
 }
 
@@ -768,12 +779,14 @@ ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname,
     RecType recType;
     void *recTypeClientData;
 
+    zebra_init_log_level();
+
     if (!zh->m_group || !*zh->m_group)
         *gprefix = '\0';
     else
         sprintf (gprefix, "%s.", zh->m_group);
     
-    yaz_log (YLOG_DEBUG, "fileExtract %s", fname);
+    yaz_log(log_level, "zebra_extract_file %s", fname);
 
     /* determine file extension */
     *ext = '\0';
@@ -876,16 +889,16 @@ ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname,
   If not, and a record is provided, then sysno is got from there
   
  */
-ZEBRA_RES buffer_extract_record(ZebraHandle zh, 
-                               const char *buf, size_t buf_size,
-                               int delete_flag,
-                               int test_mode, 
-                               const char *recordType,
-                               SYSNO *sysno,
-                               const char *match_criteria,
-                               const char *fname,
-                               int force_update,
-                               int allow_update)
+ZEBRA_RES zebra_buffer_extract_record(ZebraHandle zh, 
+                                      const char *buf, size_t buf_size,
+                                      int delete_flag,
+                                      int test_mode, 
+                                      const char *recordType,
+                                      SYSNO *sysno,
+                                      const char *match_criteria,
+                                      const char *fname,
+                                      int force_update,
+                                      int allow_update)
 {
     SYSNO sysno0 = 0;
     RecordAttr *recordAttr;
@@ -900,6 +913,8 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh,
     const char *pr_fname = fname;  /* filename to print .. */
     int show_progress = zh->records_processed < zh->m_file_verbose_limit ? 1:0;
 
+    zebra_init_log_level();
+
     if (!pr_fname)
        pr_fname = "<no file>";  /* make it printable if file is omitted */
 
@@ -930,7 +945,7 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh,
     
     if (recordType && *recordType)
     {
-        yaz_log (YLOG_DEBUG, "Record type explicitly specified: %s", recordType);
+        yaz_log(log_level, "Record type explicitly specified: %s", recordType);
         recType = recType_byName (zh->reg->recTypes, zh->res, recordType,
                                   &clientData);
     } 
@@ -941,7 +956,8 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh,
             yaz_log (YLOG_WARN, "No such record type defined");
             return ZEBRA_FAIL;
         }
-        yaz_log (YLOG_DEBUG, "Get record type from rgroup: %s",zh->m_record_type);
+        yaz_log(log_level, "Get record type from rgroup: %s",
+                zh->m_record_type);
         recType = recType_byName (zh->reg->recTypes, zh->res,
                                  zh->m_record_type, &clientData);
         recordType = zh->m_record_type;
@@ -1092,16 +1108,16 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh,
             /* record going to be deleted */
             if (zebra_rec_keys_empty(delkeys))
             {
-               yaz_log (YLOG_LOG, "delete %s %s %ld", recordType,
-                    pr_fname, (long) recordOffset);
-               yaz_log (YLOG_WARN, "cannot delete file above, "
-                            "storeKeys false (3)");
+               yaz_log(YLOG_LOG, "delete %s %s %ld", recordType,
+                        pr_fname, (long) recordOffset);
+               yaz_log(YLOG_WARN, "cannot delete file above, "
+                        "storeKeys false (3)");
            }
             else
             {
                if (show_progress)
-                   yaz_log (YLOG_LOG, "delete %s %s %ld", recordType,
-                            pr_fname, (long) recordOffset);
+                   yaz_log(YLOG_LOG, "delete %s %s %ld", recordType,
+                            pr_fname, (long) recordOffset);
                 zh->records_deleted++;
                 if (matchStr)
                {
@@ -1117,8 +1133,8 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh,
         else
         {
            if (show_progress)
-                   yaz_log (YLOG_LOG, "update %s %s %ld", recordType,
-                            pr_fname, (long) recordOffset);
+                   yaz_log(YLOG_LOG, "update %s %s %ld", recordType,
+                            pr_fname, (long) recordOffset);
            recordAttr->staticrank = extractCtrl.staticrank;
             extract_flushSortKeys (zh, *sysno, 1, zh->reg->sortKeys);
             extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys, 
@@ -1211,7 +1227,7 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh,
     return ZEBRA_OK;
 }
 
-int explain_extract (void *handle, Record rec, data1_node *n)
+ZEBRA_RES zebra_extract_explain(void *handle, Record rec, data1_node *n)
 {
     ZebraHandle zh = (ZebraHandle) handle;
     struct recExtractCtrl extractCtrl;
@@ -1277,8 +1293,7 @@ int explain_extract (void *handle, Record rec, data1_node *n)
     zebra_rec_keys_get_buf(zh->reg->sortKeys,
                           &rec->info[recInfo_sortKeys],
                           &rec->size[recInfo_sortKeys]);
-
-    return 0;
+    return ZEBRA_OK;
 }
 
 void extract_rec_keys_adjust(ZebraHandle zh, int is_insert,
@@ -1441,19 +1456,19 @@ void extract_flushWriteKeys (ZebraHandle zh, int final)
 #endif
     if (!zh->reg->key_buf || ptr_i <= 0)
     {
-        yaz_log (YLOG_DEBUG, "  nothing to flush section=%d buf=%p i=%d",
+        yaz_log(log_level, "  nothing to flush section=%d buf=%p i=%d",
                zh->reg->key_file_no, zh->reg->key_buf, ptr_i);
-        yaz_log (YLOG_DEBUG, "  buf=%p ",
+        yaz_log(log_level, "  buf=%p ",
                zh->reg->key_buf);
-        yaz_log (YLOG_DEBUG, "  ptr=%d ",zh->reg->ptr_i);
-        yaz_log (YLOG_DEBUG, "  reg=%p ",zh->reg);
+        yaz_log(log_level, "  ptr=%d ",zh->reg->ptr_i);
+        yaz_log(log_level, "  reg=%p ",zh->reg);
                
         return;
     }
 
     (zh->reg->key_file_no)++;
     yaz_log (YLOG_LOG, "sorting section %d", (zh->reg->key_file_no));
-    yaz_log (YLOG_DEBUG, "  sort_buff at %p n=%d",
+    yaz_log(log_level, "  sort_buff at %p n=%d",
                     zh->reg->key_buf + zh->reg->ptr_top - ptr_i,ptr_i);
 #if !SORT_EXTRA
     qsort (zh->reg->key_buf + zh->reg->ptr_top - ptr_i, ptr_i,
@@ -1623,7 +1638,7 @@ void print_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys)
     }
 }
 
-void extract_add_index_string(RecWord *p, const char *str, int length)
+static void extract_add_index_string(RecWord *p, const char *str, int length)
 {
     struct it_key key;
 
@@ -1703,7 +1718,7 @@ static void extract_add_sort_string(RecWord *p, const char *str, int length)
     zebra_rec_keys_write(zh->reg->sortKeys, str, length, &key);
 }
 
-void extract_add_string (RecWord *p, const char *string, int length)
+static void extract_add_string (RecWord *p, const char *string, int length)
 {
     assert (length > 0);
     if (zebra_maps_is_sort (p->zebra_maps, p->index_type))
@@ -1718,8 +1733,6 @@ static void extract_add_incomplete_field (RecWord *p)
     int remain = p->term_len;
     const char **map = 0;
     
-    yaz_log(YLOG_DEBUG, "Incomplete field, w='%.*s'", p->term_len, p->term_buf);
-
     if (remain > 0)
        map = zebra_maps_input(p->zebra_maps, p->index_type, &b, remain, 0);
 
@@ -1767,9 +1780,6 @@ static void extract_add_complete_field (RecWord *p)
     const char **map = 0;
     int i = 0, remain = p->term_len;
 
-    yaz_log(YLOG_DEBUG, "Complete field, w='%.*s'",
-           p->term_len, p->term_buf);
-
     if (remain > 0)
        map = zebra_maps_input (p->zebra_maps, p->index_type, &b, remain, 1);
 
@@ -1804,7 +1814,6 @@ static void extract_add_complete_field (RecWord *p)
            {
                if (i >= IT_MAX_WORD)
                    break;
-               yaz_log(YLOG_DEBUG, "Adding string to index '%d'", **map);
                while (i < IT_MAX_WORD && *cp)
                    buf[i++] = *(cp++);
            }
@@ -1823,15 +1832,14 @@ static void extract_add_complete_field (RecWord *p)
     extract_add_string (p, buf, i);
 }
 
-void extract_token_add (RecWord *p)
+static void extract_token_add(RecWord *p)
 {
     WRBUF wrbuf;
-#if 0
-    yaz_log (YLOG_LOG, "token_add "
-            "reg_type=%c attrSet=%d attrUse=%d seqno=%d s=%.*s",
-             p->reg_type, p->attrSet, p->attrUse, p->seqno, p->length,
-             p->string);
-#endif
+    if (log_level)
+        yaz_log(log_level, "extract_token_add "
+                "type=%c index=%s seqno=" ZINT_FORMAT " s=%.*s",
+                p->index_type, p->index_name, 
+                p->seqno, p->term_len, p->term_buf);
     if ((wrbuf = zebra_replace(p->zebra_maps, p->index_type, 0,
                               p->term_buf, p->term_len)))
     {
@@ -1869,7 +1877,7 @@ static void extract_set_store_data_prepare(struct recExtractCtrl *p)
     p->setStoreData = extract_set_store_data_cb;
 }
 
-void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid)
+static void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid)
 {
     ZebraHandle zh = (ZebraHandle) p->handle;
     zebraExplain_addSchema (zh->reg->zei, oid);
@@ -1900,13 +1908,13 @@ void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
     }
 }
 
-void encode_key_init (struct encode_info *i)
+static void encode_key_init(struct encode_info *i)
 {
     i->encode_handle = iscz1_start();
     i->decode_handle = iscz1_start();
 }
 
-void encode_key_write (char *k, struct encode_info *i, FILE *outf)
+static void encode_key_write (char *k, struct encode_info *i, FILE *outf)
 {
     struct it_key key;
     char *bp = i->buf, *bp0;
@@ -1950,7 +1958,7 @@ void encode_key_write (char *k, struct encode_info *i, FILE *outf)
 #endif
 }
 
-void encode_key_flush (struct encode_info *i, FILE *outf)
+static void encode_key_flush (struct encode_info *i, FILE *outf)
 { 
     iscz1_stop(i->encode_handle);
     iscz1_stop(i->decode_handle);

diff --git a/index/index.h b/index/index.h
index e6565da..1bb24f1 100644 (file)
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.166 2006-05-30 13:44:44 adam Exp $
+/* $Id: index.h,v 1.167 2006-06-13 12:02:08 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -349,16 +349,16 @@ void extract_get_fname_tmp (ZebraHandle zh, char *fname, int no);
 
 void zebra_index_merge (ZebraHandle zh);
 
-ZEBRA_RES buffer_extract_record (ZebraHandle zh, 
-                                const char *buf, size_t buf_size,
-                                int delete_flag,
-                                int test_mode, 
-                                const char *recordType,
-                                SYSNO *sysno,
-                                const char *match_criteria,
-                                const char *fname,
-                                int force_update,
-                                int allow_update);
+ZEBRA_RES zebra_buffer_extract_record(ZebraHandle zh, 
+                                      const char *buf, size_t buf_size,
+                                      int delete_flag,
+                                      int test_mode, 
+                                      const char *recordType,
+                                      SYSNO *sysno,
+                                      const char *match_criteria,
+                                      const char *fname,
+                                      int force_update,
+                                      int allow_update);
 
 #if 0
 int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
@@ -394,14 +394,7 @@ ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys,
 ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname,
                                    zint sysno, zebra_snippets *snippets);
 
-void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
-                              int cmd, zebra_rec_keys_t reckeys,
-                             zint staticrank);
-void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
-                            int cmd, zebra_rec_keys_t skp);
-void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid);
-void extract_token_add (RecWord *p);
-int explain_extract (void *handle, Record rec, data1_node *n);
+ZEBRA_RES zebra_extract_explain(void *handle, Record rec, data1_node *n);
 
 ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname,
                             int deleteFlag);

diff --git a/index/zebraapi.c b/index/zebraapi.c
index b293fc2..38bc751 100644 (file)
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.221 2006-06-12 09:39:18 marc Exp $
+/* $Id: zebraapi.c,v 1.222 2006-06-13 12:02:12 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -478,7 +478,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
     {
        reg->zei = zebraExplain_open(reg->records, reg->dh,
                                     res, rw, reg,
-                                    explain_extract);
+                                    zebra_extract_explain);
        if (!reg->zei)
        {
            yaz_log (YLOG_WARN, "Cannot obtain EXPLAIN information");
@@ -1398,15 +1398,15 @@ ZEBRA_RES zebra_admin_exchange_record(ZebraHandle zh,
        }
        action = 1;  /* make it an insert (if it's an update).. */
     }
-    res = buffer_extract_record (zh, rec_buf, rec_len,
-                                action == 3 ? 1 : 0 /* delete flag */,
-                                0, /* test mode */
-                                0, /* recordType */
-                                &sysno, 
-                                0, /* match */
-                                0, /* fname */
-                                0, /* force update */
-                                1  /* allow update */
+    res = zebra_buffer_extract_record(zh, rec_buf, rec_len,
+                                      action == 3 ? 1 : 0 /* delete flag */,
+                                      0, /* test mode */
+                                      0, /* recordType */
+                                      &sysno, 
+                                      0, /* match */
+                                      0, /* fname */
+                                      0, /* force update */
+                                      1  /* allow update */
        );
     if (res == ZEBRA_FAIL)
     {
@@ -2220,14 +2220,14 @@ ZEBRA_RES zebra_insert_record(ZebraHandle zh,
 
     if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
        return ZEBRA_FAIL;
-    res = buffer_extract_record (zh, buf, buf_size, 
-                                0, /* delete_flag  */
-                                0, /* test_mode */
-                                recordType,
-                                sysno,   
-                                match, fname,
-                                0, 
-                                0); /* allow_update */
+    res = zebra_buffer_extract_record(zh, buf, buf_size, 
+                                      0, /* delete_flag  */
+                                      0, /* test_mode */
+                                      recordType,
+                                      sysno,   
+                                      match, fname,
+                                      0, 
+                                      0); /* allow_update */
     if (zebra_end_trans(zh) != ZEBRA_OK)
     {
        yaz_log(YLOG_WARN, "zebra_end_trans failed");
@@ -2257,14 +2257,14 @@ ZEBRA_RES zebra_update_record (ZebraHandle zh,
 
     if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
        return ZEBRA_FAIL;
-    res = buffer_extract_record (zh, buf, buf_size, 
-                                0, /* delete_flag */
-                                0, /* test_mode */
-                                recordType,
-                                sysno,   
-                                match, fname,
-                                force_update, 
-                                1); /* allow_update */
+    res = zebra_buffer_extract_record(zh, buf, buf_size, 
+                                      0, /* delete_flag */
+                                      0, /* test_mode */
+                                      recordType,
+                                      sysno,   
+                                      match, fname,
+                                      force_update, 
+                                      1); /* allow_update */
     if (zebra_end_trans(zh) != ZEBRA_OK)
     {
        yaz_log(YLOG_WARN, "zebra_end_trans failed");
@@ -2293,14 +2293,14 @@ ZEBRA_RES zebra_delete_record (ZebraHandle zh,
 
     if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
        return ZEBRA_FAIL;
-    res = buffer_extract_record (zh, buf, buf_size,
-                                1, /* delete_flag */
-                                0, /* test_mode */
-                                recordType,
-                                sysno,
-                                match,fname,
-                                force_update,
-                                1); /* allow_update */
+    res = zebra_buffer_extract_record(zh, buf, buf_size,
+                                      1, /* delete_flag */
+                                      0, /* test_mode */
+                                      recordType,
+                                      sysno,
+                                      match,fname,
+                                      force_update,
+                                      1); /* allow_update */
     if (zebra_end_trans(zh) != ZEBRA_OK)
     {
        yaz_log(YLOG_WARN, "zebra_end_trans failed");

diff --git a/index/zinfo.c b/index/zinfo.c
index 5146554..908fdd3 100644 (file)
--- a/index/zinfo.c
+++ b/index/zinfo.c
@@ -1,4 +1,4 @@
-/* $Id: zinfo.c,v 1.65 2006-05-19 23:20:24 adam Exp $
+/* $Id: zinfo.c,v 1.66 2006-06-13 12:02:12 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -114,7 +114,7 @@ struct zebraExplainInfo {
     struct zebDatabaseInfoB *curDatabaseInfo;
     zebAccessInfo accessInfo;
     char date[15]; /* YYYY MMDD HH MM SS */
-    int (*updateFunc)(void *handle, Record drec, data1_node *n);
+    ZebraExplainUpdateFunc *updateFunc;
     void *updateHandle;
 };
 
@@ -336,7 +336,7 @@ ZebraExplainInfo zebraExplain_open(
     Res res,
     int writeFlag,
     void *updateHandle,
-    int (*updateFunc)(void *handle, Record drec, data1_node *n))
+    ZebraExplainUpdateFunc *updateFunc)
 {
     Record trec;
     ZebraExplainInfo zei;
@@ -359,6 +359,9 @@ ZebraExplainInfo zebraExplain_open(
     zei->records = records;
     zei->nmem = nmem;
     zei->dh = dh;
+    
+    data1_get_absyn (zei->dh, "explain", DATA1_XPATH_INDEXING_DISABLE);
+
     zei->attsets = NULL;
     zei->res = res;
     zei->categoryList = (struct zebraCategoryListInfo *)

diff --git a/index/zinfo.h b/index/zinfo.h
index 7597292..3121162 100644 (file)
--- a/index/zinfo.h
+++ b/index/zinfo.h
@@ -1,4 +1,4 @@
-/* $Id: zinfo.h,v 1.33 2006-05-19 23:20:24 adam Exp $
+/* $Id: zinfo.h,v 1.34 2006-06-13 12:02:13 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -37,15 +37,18 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 YAZ_BEGIN_CDECL
 
+typedef ZEBRA_RES ZebraExplainUpdateFunc(void *handle,
+                                         Record drec, 
+                                         data1_node *n);
+
 typedef struct zebraExplainInfo *ZebraExplainInfo;
 typedef struct zebDatabaseInfo ZebDatabaseInfo;
-ZebraExplainInfo zebraExplain_open (Records records, data1_handle dh,
-                                   Res res,
-                                   int writeFlag,
-                                   void *updateHandle,
-                                   int (*updateFunc)(void *handle,
-                                                     Record drec,
-                                                     data1_node *n));
+ZebraExplainInfo zebraExplain_open(Records records, data1_handle dh,
+                                   Res res,
+                                   int writeFlag,
+                                   void *updateHandle,
+                                   ZebraExplainUpdateFunc *);
+
 void zebraExplain_close (ZebraExplainInfo zei);
 int zebraExplain_curDatabase (ZebraExplainInfo zei, const char *database);
 int zebraExplain_newDatabase (ZebraExplainInfo zei, const char *database,

diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c
index f45f4d7..fecf2c5 100644 (file)
--- a/recctrl/recgrs.c
+++ b/recctrl/recgrs.c
@@ -1,4 +1,4 @@
-/* $Id: recgrs.c,v 1.110 2006-05-19 13:49:35 adam Exp $
+/* $Id: recgrs.c,v 1.111 2006-06-13 12:02:15 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -529,10 +529,8 @@ static void index_xpath(struct source_parser *sp, data1_node *n,
     int termlist_only = 1;
     data1_termlist *tl;
     int xpdone = 0;
-    yaz_log(YLOG_DEBUG, "index_xpath level=%d xpath_index=%s",
-           level, xpath_index);
     if ((!n->root->u.root.absyn) ||
-       (n->root->u.root.absyn->enable_xpath_indexing)) {
+       (n->root->u.root.absyn->xpath_indexing == DATA1_XPATH_INDEXING_ENABLE)) {
        termlist_only = 0;
     }