Allow 'index' setting value 'none' for no index types.

[idzebra-moved-to-github.git] / index / zebraapi.c

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 7ebb47a..f709ee6 100644 (file)
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.263 2007-11-05 11:20:39 adam Exp $
+/* $Id: zebraapi.c,v 1.266 2007-12-18 10:04:15 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -381,7 +381,6 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
     data1_set_tabroot (reg->dh, reg_path);
     reg->recTypes = recTypes_init (zs->record_classes, reg->dh);
 
-    reg->index_types = 0;
     reg->zebra_maps =
        zebra_maps_open(res, reg_path, profilePath);
     if (!reg->zebra_maps)
@@ -421,32 +420,8 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
        record_compression = REC_COMPRESS_BZIP2;
 
     {
-        const char *index_types_fname = res_get(res, "indextypes");
-        if (index_types_fname)
-        {
-            char tmp_full_name[1024];
-
-            if (!yaz_filepath_resolve(index_types_fname,
-                                      profilePath,
-                                      reg_path,
-                                      tmp_full_name))
-            {
-                yaz_log(YLOG_WARN, "Could not find %s", index_types_fname);
-                ret = ZEBRA_FAIL;
-            }
-            else
-            {
-                reg->index_types = zebra_index_types_create(
-                    tmp_full_name);
-                yaz_log(YLOG_LOG, "zebra_index_types_create returned %p", 
-                        reg->index_types);
-            }
-        }
-
-    }
-    {
        const char *index_fname = res_get_def(res, "index", "default.idx");
-       if (index_fname && *index_fname)
+       if (index_fname && *index_fname && strcmp(index_fname, "none"))
        {
            if (zebra_maps_read_file(reg->zebra_maps, index_fname) != ZEBRA_OK)
                ret = ZEBRA_FAIL;
@@ -604,7 +579,6 @@ static void zebra_register_close(ZebraService zs, struct zebra_register *reg)
 
     recTypes_destroy (reg->recTypes);
     zebra_maps_close (reg->zebra_maps);
-    zebra_index_types_destroy(reg->index_types);
     zebraRankDestroy (reg);
     bfs_destroy (reg->bfs);
     data1_destroy (reg->dh);
@@ -1175,7 +1149,6 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
                recs[i].errCode =
                    zebra_record_fetch(zh, setname,
                                        poset[i].sysno, poset[i].score,
-                                      hit_snippet,
                                       stream, input_format, comp,
                                       &recs[i].format, &buf, &len,
                                       &recs[i].base, &recs[i].errString);