X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=74400fb7ad296c8a03eddc5248a1327cc1cf919f;hb=05f72596a6a875f108fe8a933069f3ff942e471e;hp=eaf69870122702f2789168911377cea6f08008af;hpb=134389ffedebe3bbb00cb88f3f3ceace3241945a;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index eaf6987..74400fb 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,10 +1,32 @@
 /*
- * Copyright (C) 1995-1998, Index Data
+ * Copyright (C) 1995-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zebraapi.c,v $
- * Revision 1.13  1998-12-16 12:23:30  adam
+ * Revision 1.20  1999-07-06 12:28:04  adam
+ * Updated record index structure. Format includes version ID. Compression
+ * algorithm ID is stored for each record block.
+ *
+ * Revision 1.19  1999/05/26 07:49:13  adam
+ * C++ compilation.
+ *
+ * Revision 1.18  1999/05/15 14:36:38  adam
+ * Updated dictionary. Implemented "compression" of dictionary.
+ *
+ * Revision 1.17  1999/05/12 13:08:06  adam
+ * First version of ISAMS.
+ *
+ * Revision 1.16  1999/02/19 10:38:30  adam
+ * Implemented chdir-setting.
+ *
+ * Revision 1.15  1999/02/17 12:18:12  adam
+ * Fixed zebra_close so that a NULL pointer is ignored.
+ *
+ * Revision 1.14  1999/02/02 14:51:11  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.13  1998/12/16 12:23:30  adam
  * Added facility for database name mapping using resource mapdb.
  *
  * Revision 1.12  1998/11/16 10:18:10  adam
@@ -53,9 +75,10 @@
  */
 
 #include <stdio.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #include <process.h>
+#include <direct.h>
 #else
 #include <unistd.h>
 #endif
@@ -63,10 +86,26 @@
 #include <diagbib1.h>
 #include "zserver.h"
 
+static void zebra_chdir (ZebraHandle zh)
+{
+    const char *dir = res_get (zh->res, "chdir");
+    if (!dir)
+	return;
+    logf (LOG_DEBUG, "chdir %s", dir);
+#ifdef WIN32
+    _chdir(dir);
+#else
+    chdir (dir);
+#endif
+}
 static int zebra_register_lock (ZebraHandle zh)
 {
     time_t lastChange;
-    int state = zebra_server_lock_get_state(zh, &lastChange);
+    int state;
+
+    zebra_chdir (zh);
+
+    state = zebra_server_lock_get_state(zh, &lastChange);
 
     switch (state)
     {
@@ -106,8 +145,8 @@ static int zebra_register_lock (ZebraHandle zh)
     }
     bf_cache (zh->bfs, state ? res_get (zh->res, "shadow") : NULL);
     zh->registerState = state;
-    zh->records = rec_open (zh->bfs, 0);
-    if (!(zh->dict = dict_open (zh->bfs, FNAME_DICT, 40, 0)))
+    zh->records = rec_open (zh->bfs, 0, 0);
+    if (!(zh->dict = dict_open (zh->bfs, FNAME_DICT, 40, 0, 0)))
     {
 	logf (LOG_WARN, "dict_open");
         return -1;
@@ -119,22 +158,31 @@ static int zebra_register_lock (ZebraHandle zh)
     }
     zh->isam = NULL;
     zh->isamc = NULL;
-    if (!res_get_match (zh->res, "isam", "i", NULL))
+    zh->isams = NULL;
+    if (res_get_match (zh->res, "isam", "i", NULL))
     {
-        if (!(zh->isamc = isc_open (zh->bfs, FNAME_ISAMC,
-				    0, key_isamc_m(zh->res))))
+        if (!(zh->isam = is_open (zh->bfs, FNAME_ISAM, key_compare, 0,
+                                  sizeof (struct it_key), zh->res)))
 	{
-	    logf (LOG_WARN, "isc_open");
+	    logf (LOG_WARN, "is_open");
+            return -1;
+	}
+    }
+    else if (res_get_match (zh->res, "isam", "s", NULL))
+    {
+        if (!(zh->isams = isams_open (zh->bfs, FNAME_ISAMS, 0,
+				      key_isams_m(zh->res))))
+	{
+	    logf (LOG_WARN, "isams_open");
             return -1;
 	}
-
     }
     else
     {
-        if (!(zh->isam = is_open (zh->bfs, FNAME_ISAM, key_compare, 0,
-                                  sizeof (struct it_key), zh->res)))
+        if (!(zh->isamc = isc_open (zh->bfs, FNAME_ISAMC,
+				    0, key_isamc_m(zh->res))))
 	{
-	    logf (LOG_WARN, "is_open");
+	    logf (LOG_WARN, "isc_open");
             return -1;
 	}
     }
@@ -161,7 +209,7 @@ static void zebra_register_unlock (ZebraHandle zh)
         else
             waitSec = 0;
     }
-#ifdef WINDOWS
+#ifdef WIN32
 #else
     if (waitSec > 0)
         sleep (waitSec);
@@ -172,13 +220,14 @@ static void zebra_register_unlock (ZebraHandle zh)
 
 ZebraHandle zebra_open (const char *configName)
 {
-    ZebraHandle zh = xmalloc (sizeof(*zh));
+    ZebraHandle zh = (ZebraHandle) xmalloc (sizeof(*zh));
 
     if (!(zh->res = res_open (configName)))
     {
 	logf (LOG_WARN, "Failed to read resources `%s'", configName);
 	return NULL;
     }
+    zebra_chdir (zh);
     zebra_server_lock_init (zh);
     zh->dh = data1_create ();
     zh->bfs = bfs_create (res_get (zh->res, "register"));
@@ -213,6 +262,9 @@ ZebraHandle zebra_open (const char *configName)
 
 void zebra_close (ZebraHandle zh)
 {
+    if (!zh)
+	return;
+    zebra_chdir (zh);
     if (zh->records)
     {
         resultSetDestroy (zh);
@@ -223,6 +275,8 @@ void zebra_close (ZebraHandle zh)
             is_close (zh->isam);
         if (zh->isamc)
             isc_close (zh->isamc);
+	if (zh->isams)
+	    isams_close (zh->isams);
         rec_close (&zh->records);
         zebra_register_unlock (zh);
     }
@@ -251,7 +305,7 @@ struct map_baseinfo {
 	
 void map_basenames_func (void *vp, const char *name, const char *value)
 {
-    struct map_baseinfo *p = vp;
+    struct map_baseinfo *p = (struct map_baseinfo *) vp;
     int i, no;
     char fromdb[128], todb[8][128];
     
@@ -332,7 +386,7 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream,
 
     zh->errCode = 0;
     zh->errString = NULL;
-    pos_array = xmalloc (num_recs * sizeof(*pos_array));
+    pos_array = (int *) xmalloc (num_recs * sizeof(*pos_array));
     for (i = 0; i<num_recs; i++)
 	pos_array[i] = recs[i].position;