X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=1705416b2fc7ff4ddc01cc1e8c3be6f09f0db5b0;hb=fbf46d6d15f99ed15ae0089a95df6efaf3e205bd;hp=6b34587fe0c9af5e62e11b9d549bf8219b433f16;hpb=47ea1fc957c7b97bb30a26698f072109cae275e4;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index 6b34587..1705416 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -1,9 +1,26 @@
-/*
- * Copyright (C) 1995-2002, Index Data 
- * All rights reserved.
- *
- * $Id: zserver.c,v 1.89 2002-07-25 13:06:43 adam Exp $
- */
+/* $Id: zserver.c,v 1.95 2002-09-06 20:38:01 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 
 #include <stdio.h>
 #include <assert.h>
@@ -49,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 open config `%s'", sob->configname);
 	r->errcode = 1;
 	return r;
     }
@@ -183,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;
@@ -687,7 +699,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);