X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=8e489d4937bd79ca9c9012f546a8e61d55531668;hb=efcd52e23097c5fa48a5c6eacd3e1f6edc0e8e32;hp=dfaf1feb5e13889359ffb0e0b07a826b21d4163b;hpb=896c0427df9d8eff5de6a1735dcd992e067df844;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index dfaf1fe..8e489d4 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -1,4 +1,4 @@
-/* $Id: zserver.c,v 1.90 2002-08-02 19:26:56 adam Exp $
+/* $Id: zserver.c,v 1.96 2002-09-09 09:35:17 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -66,20 +66,15 @@ bend_initresult *bend_init (bend_initrequest *q)
     q->bend_fetch = bend_fetch;
     q->bend_scan = bend_scan;
 
-#if ZMBOL
-    q->implementation_name = "Z'mbol Information Server";
-    q->implementation_version = "Z'mbol " ZEBRAVER;
-#else
     q->implementation_name = "Zebra Information Server";
     q->implementation_version = "Zebra " ZEBRAVER;
-#endif
 
     logf (LOG_DEBUG, "bend_init");
 
     sob = statserv_getcontrol ();
     if (!(zh = zebra_open (sob->handle)))
     {
-	yaz_log (LOG_FATAL, "Failed to open config `%s'", sob->configname);
+	yaz_log (LOG_WARN, "Failed to read config `%s'", sob->configname);
 	r->errcode = 1;
 	return r;
     }
@@ -200,12 +195,12 @@ static void search_terms (ZebraHandle zh, bend_search_rr *r)
         switch (type)
         {
         case Z_Term_characterString:
-            yaz_log (LOG_LOG, "term as characterString");
+            yaz_log (LOG_DEBUG, "term as characterString");
             term->which = Z_Term_characterString;
             term->u.characterString = odr_strdup (r->stream, outbuf);
             break;
         case Z_Term_general:
-            yaz_log (LOG_LOG, "term as general");
+            yaz_log (LOG_DEBUG, "term as general");
             term->which = Z_Term_general;
             term->u.general = odr_malloc (r->stream, sizeof(*term->u.general));
             term->u.general->size = term->u.general->len = len;
@@ -679,6 +674,11 @@ static void bend_start (struct statserv_options_block *sob)
     if (sob->handle)
 	zebra_stop((ZebraService) sob->handle);
     sob->handle = zebra_start(sob->configname);
+    if (!sob->handle)
+    {
+	yaz_log (LOG_FATAL, "Failed to read config `%s'", sob->configname);
+	exit (1);
+    }
 }
 
 static void bend_stop(struct statserv_options_block *sob)
@@ -704,7 +704,9 @@ int main (int argc, char **argv)
     strcpy (sob->configname, "zebra.cfg");
     sob->bend_start = bend_start;
     sob->bend_stop = bend_stop;
-
+#ifdef WIN32
+    strcpy (sob->service_display_name, "Zebra Server");
+#endif
     statserv_setcontrol (sob);
 
     return statserv_main (argc, argv, bend_init, bend_close);