Added truncation 5=106.

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

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 0d9d815..3400ea9 100644 (file)
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zebraapi.c,v $
- * Revision 1.21  1999-07-14 10:59:26  adam
+ * Revision 1.24  1999-10-14 14:33:50  adam
+ * Added truncation 5=106.
+ *
+ * Revision 1.23  1999/09/07 11:36:32  adam
+ * Minor changes.
+ *
+ * Revision 1.22  1999/08/02 10:13:47  adam
+ * Fixed bug regarding zebra_hits.
+ *
+ * Revision 1.21  1999/07/14 10:59:26  adam
  * Changed functions isc_getmethod, isams_getmethod.
  * Improved fatal error handling (such as missing EXPLAIN schema).
  *
@@ -112,7 +121,6 @@ static int zebra_register_lock (ZebraHandle zh)
 
     zh->errCode = 0;
     zh->errString = 0;
-    zh->hits = 0;
 
     zebra_chdir (zh);
 
@@ -270,7 +278,20 @@ ZebraHandle zebra_open (const char *configName)
     zebra_chdir (zh);
     zebra_server_lock_init (zh);
     zh->dh = data1_create ();
+    if (!zh->dh)
+    {
+        zebra_server_lock_destroy (zh);
+        xfree (zh);
+        return 0;
+    }
     zh->bfs = bfs_create (res_get (zh->res, "register"));
+    if (!zh->bfs)
+    {
+        zebra_server_lock_destroy (zh);
+        data1_destroy(zh->dh);
+        xfree (zh);
+        return 0;
+    }
     bf_lockDir (zh->bfs, res_get (zh->res, "lockDir"));
     data1_set_tabpath (zh->dh, res_get(zh->res, "profilePath"));
     zh->sets = NULL;
@@ -331,7 +352,6 @@ void zebra_close (ZebraHandle zh)
        passwd_db_close (zh->passwd_db);
     res_close (zh->res);
     xfree (zh);
-    xmalloc_trav("x");
 }
 
 struct map_baseinfo {
@@ -406,6 +426,7 @@ void zebra_search_rpn (ZebraHandle zh, ODR stream, ODR decode,
                       Z_RPNQuery *query, int num_bases, char **basenames, 
                       const char *setname)
 {
+    zh->hits = 0;
     if (zebra_register_lock (zh))
        return;
     map_basenames (zh, stream, &num_bases, &basenames);