The test option (-s) only uses read-lock (and not write lock).

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

diff --git a/index/zserver.c b/index/zserver.c
index 12314b5..94cb90e 100644 (file)
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -1,10 +1,23 @@
 /*
- * Copyright (C) 1995-1997, Index Data I/S 
+ * Copyright (C) 1995-1998, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.c,v $
- * Revision 1.50  1997-09-29 09:08:36  adam
+ * Revision 1.53  1998-01-12 15:04:09  adam
+ * The test option (-s) only uses read-lock (and not write lock).
+ *
+ * Revision 1.52  1997/11/18 10:05:08  adam
+ * Changed character map facility so that admin can specify character
+ * mapping files for each register type, w, p, etc.
+ *
+ * Revision 1.51  1997/10/27 14:33:06  adam
+ * Moved towards generic character mapping depending on "structure"
+ * field in abstract syntax file. Fixed a few memory leaks. Fixed
+ * bug with negative integers when doing searches with relational
+ * operators.
+ *
+ * Revision 1.50  1997/09/29 09:08:36  adam
  * Revised locking system to be thread safe for the server.
  *
  * Revision 1.49  1997/09/25 14:57:23  adam
@@ -259,7 +272,7 @@ static int register_lock (ZServerInfo *zi)
             return -1;
     }
     zi->zti = zebTargetInfo_open (zi->records, 0);
-    init_charmap (zi->res);
+
     return 0;
 }
 
@@ -306,8 +319,9 @@ bend_initresult *bend_init (bend_initrequest *q)
     logf (LOG_LOG, "Reading resources from %s", sob->configname);
     if (!(zi->res = res_open (sob->configname)))
     {
-       logf (LOG_FATAL, "Cannot open resource `%s'", sob->configname);
-       exit (1);
+       logf (LOG_FATAL, "Failed to read resources `%s'", sob->configname);
+       r->errcode = 1;
+       return r;
     }
     zebra_server_lock_init (zi);
     zi->dh = data1_create ();
@@ -321,6 +335,8 @@ bend_initresult *bend_init (bend_initrequest *q)
     zi->records = NULL;
     zi->odr = odr_createmem (ODR_ENCODE);
     zi->registered_sets = NULL;
+    zi->zebra_maps = zebra_maps_open (res_get(zi->res, "profilePath"),
+                                     zi->res);
     return r;
 }
 
@@ -430,9 +446,8 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
 
     if (!(rt = recType_byName (file_type, subType)))
     {
-        logf (LOG_FATAL|LOG_ERRNO, "Retrieve: Cannot handle type %s", 
-              file_type);
-        exit (1);
+        logf (LOG_WARN, "Retrieve: Cannot handle type %s",  file_type);
+       return 14;
     }
     logf (LOG_DEBUG, "retrieve localno=%d score=%d", sysno, score);
     retrieveCtrl.fh = &fc;
@@ -560,9 +575,11 @@ bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num)
 void bend_close (void *handle)
 {
     ZServerInfo *zi = handle;
+
     if (zi->records)
     {
         resultSetDestroy (zi);
+        zebTargetInfo_close (zi->zti, 0);
         dict_close (zi->dict);
         if (zi->isam)
             is_close (zi->isam);
@@ -571,18 +588,44 @@ void bend_close (void *handle)
         rec_close (&zi->records);
         register_unlock (zi);
     }
+    odr_destroy (zi->odr);
+    zebra_maps_close (zi->zebra_maps);
     bfs_destroy (zi->bfs);
     data1_destroy (zi->dh);
     zebra_server_lock_destroy (zi);
-    return;
+
+    res_close (zi->res);
+    xfree (zi);
 }
 
+#ifndef WINDOWS
+static void pre_init (struct statserv_options_block *sob)
+{
+    char *pidfile = "zebrasrv.pid";
+    int fd = creat (pidfile, 0666);
+    
+    if (fd == -1)
+       logf (LOG_WARN|LOG_ERRNO, "creat %s", pidfile);
+    else
+    {
+       char pidstr[30];
+       
+       sprintf (pidstr, "%ld", (long) getpid ());
+       write (fd, pidstr, strlen(pidstr));
+       close (fd);
+    }
+}
+#endif
+
 int main (int argc, char **argv)
 {
     struct statserv_options_block *sob;
 
     sob = statserv_getcontrol ();
     strcpy (sob->configname, FNAME_CONFIG);
+#ifndef WINDOWS
+    sob->pre_init = pre_init;
+#endif
     statserv_setcontrol (sob);
 
     return statserv_main (argc, argv);