X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebraapi.c;h=6fefbb20c66fd84498f65179763cb63d5a5f062c;hp=d17444ed1cd9f66ee1795258edce71f08bae67a6;hb=3fcc65de3bb8ac7af03900dccf23a5b1219b2e8e;hpb=53f50a1b1dd002ef484a41f50f3598386335cae1

diff --git a/index/zebraapi.c b/index/zebraapi.c
index d17444e..6fefbb2 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.255 2007-05-08 12:50:04 adam Exp $
+/* $Id: zebraapi.c,v 1.258 2007-08-27 17:22:22 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -99,6 +99,12 @@ static struct zebra_register *zebra_register_open(ZebraService zs,
 						  const char *reg_path);
 static void zebra_register_close(ZebraService zs, struct zebra_register *reg);
 
+const char *zebra_get_encoding(ZebraHandle zh)
+{
+    assert(zh && zh->session_res);
+    return res_get_def(zh->session_res, "encoding", "ISO-8859-1");
+}
+
 ZebraHandle zebra_open(ZebraService zs, Res res)
 {
     ZebraHandle zh;
@@ -147,7 +153,7 @@ ZebraHandle zebra_open(ZebraService zs, Res res)
     zh->break_handler_func = 0;
     zh->break_handler_data = 0;
 
-    default_encoding = res_get_def(zh->session_res, "encoding", "ISO-8859-1");
+    default_encoding = zebra_get_encoding(zh);
 
     zh->iconv_to_utf8 =
         yaz_iconv_open ("UTF-8", default_encoding);
@@ -186,6 +192,8 @@ ZebraService zebra_start(const char *configName)
 ZebraService zebra_start_res(const char *configName, Res def_res, Res over_res)
 {
     Res res;
+    char version_str[16];
+    char system_str[80];
 
     zebra_flock_init();
 
@@ -195,7 +203,9 @@ ZebraService zebra_start_res(const char *configName, Res def_res, Res over_res)
         log_level_initialized = 1;
     }
     
-    yaz_log(YLOG_LOG, "zebra_start %s %s", ZEBRAVER,
+    zebra_get_version(version_str, system_str);
+
+    yaz_log(YLOG_LOG, "zebra_start %s %s", version_str,
 	    configName ? configName : "");
 
     if ((res = res_open(def_res, over_res)))
@@ -1138,7 +1148,8 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
 					  hit_snippet);
 #endif
 		recs[i].errCode =
-		    zebra_record_fetch(zh, poset[i].sysno, poset[i].score,
+		    zebra_record_fetch(zh, setname,
+                                       poset[i].sysno, poset[i].score,
 				       hit_snippet,
 				       stream, input_format, comp,
 				       &recs[i].format, &buf, &len,