SWIG API has separated structures for service and session now. index.h

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

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 88540c0..b92e0b4 100644 (file)
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.186 2005-09-15 09:27:18 pop Exp $
+/* $Id: zebraapi.c,v 1.188 2005-09-16 17:00:41 pop Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -46,8 +46,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #define ASSERTZHRES assert(zh && zh->service && zh->res)
 #define ASSERTZS assert(zs)
 
-static int log_level = 0;
-static int log_level_initialized = 0;
+static int log_level = YLOG_LOG;
+static int log_level_initialized = 1;
 
 static void zebra_open_res(ZebraHandle zh);
 static void zebra_close_res(ZebraHandle zh);
@@ -129,8 +129,6 @@ ZebraHandle zebra_open(ZebraService zs, Res res)
     zh->shadow_enable = 1;
     zh->m_staticrank = 0;
 
-    zebra_open_res(zh);
-
     default_encoding = res_get_def(zh->session_res, "encoding", "ISO-8859-1");
 
     zh->iconv_to_utf8 =
@@ -200,7 +198,7 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
 
         if (!passwd_plain && !passwd_encrypt)
             zh->passwd_db = NULL;
-        else
+        else 
         {
             zh->passwd_db = passwd_db_open();
             if (!zh->passwd_db)
@@ -1996,7 +1994,7 @@ ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding)
 {
     ASSERTZH;
     assert(encoding);
-    yaz_log(log_level, "zebra_octet_term_encoding");
+    yaz_log(log_level, "zebra_octet_term_encoding %s", encoding);
     zebra_clearError(zh);
 
     if (zh->iconv_to_utf8 != 0)