X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=f709ee6508bd621a1b3bd4462fcfbec9551de805;hb=6ba2b233baf29688eb6e311f44a623890b604f3d;hp=f648db9a6e0a39b2e24ac15159acf5f0532490ee;hpb=d82c0efad7971d102220a8824e1ea674db5b7fe2;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index f648db9..f709ee6 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.260 2007-10-29 09:25:41 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);
@@ -1251,7 +1224,6 @@ ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 		     const char *setname)
 {
     ZEBRA_RES res;
-    RSET limit_rset = 0;
 
     ZEBRA_CHECK_HANDLE(zh);
 
@@ -1269,21 +1241,10 @@ ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 	*num_entries = 0;
 	return ZEBRA_FAIL;
     }
-    if (setname)
-    {
-	limit_rset = resultSetRef(zh, setname);
-	if (!limit_rset)
-	{
-	    zebra_setError(zh, 
-			   YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
-			   setname);
-	    zebra_end_read (zh);
-	    return ZEBRA_FAIL;
-	}
-    }
+
     res = rpn_scan(zh, stream, zapt, attributeset,
                    zh->num_basenames, zh->basenames, position,
-                   num_entries, entries, is_partial, limit_rset);
+                   num_entries, entries, is_partial, setname);
     zebra_end_read(zh);
     return res;
 }
@@ -1551,11 +1512,12 @@ ZEBRA_RES zebra_create_database (ZebraHandle zh, const char *db)
     return zebra_end_trans (zh);
 }
 
-int zebra_string_norm(ZebraHandle zh, unsigned reg_id,
+int zebra_string_norm(ZebraHandle zh, const char *index_type,
 		      const char *input_str, int input_len,
 		      char *output_str, int output_len)
 {
     WRBUF wrbuf;
+    zebra_map_t zm = zebra_map_get(zh->reg->zebra_maps, index_type);
     ASSERTZH;
     assert(input_str);
     assert(output_str);
@@ -1563,8 +1525,7 @@ int zebra_string_norm(ZebraHandle zh, unsigned reg_id,
 
     if (!zh->reg->zebra_maps)
 	return -1;
-    wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, "",
-			  input_str, input_len);
+    wrbuf = zebra_replace(zm, "", input_str, input_len);
     if (!wrbuf)
 	return -2;
     if (wrbuf_len(wrbuf) >= output_len)