X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=a740d5738291772174eed5794ad3dce789e7ab7c;hb=28f3461a79a4569d736f4ffc66c6ae207e38c2ab;hp=464c826c8569fe83e5fbdd4c5749565732a525d4;hpb=3b985da49d20315701f5bb2db353d242ff1e85a6;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 464c826..a740d57 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zebraapi.c,v $
- * Revision 1.22  1999-08-02 10:13:47  adam
+ * Revision 1.26  1999-11-30 13:48:03  adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.25  1999/11/04 15:00:45  adam
+ * Implemented delete result set(s).
+ *
+ * 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
@@ -90,7 +102,7 @@
 #include <unistd.h>
 #endif
 
-#include <diagbib1.h>
+#include <yaz/diagbib1.h>
 #include "zserver.h"
 
 static void zebra_chdir (ZebraHandle zh)
@@ -152,20 +164,24 @@ static int zebra_register_lock (ZebraHandle zh)
 	    dict_close (zh->dict);
 	if (zh->sortIdx)
 	    sortIdx_close (zh->sortIdx);
+        if (zh->isams)
+            isams_close (zh->isams);
+#if ZMBOL
         if (zh->isam)
             is_close (zh->isam);
         if (zh->isamc)
             isc_close (zh->isamc);
-        if (zh->isams)
-            isams_close (zh->isams);
+#endif
         rec_close (&zh->records);
     }
     bf_cache (zh->bfs, state ? res_get (zh->res, "shadow") : NULL);
     zh->registerState = state;
 
+    zh->isams = NULL;
+#if ZMBOL
     zh->isam = NULL;
     zh->isamc = NULL;
-    zh->isams = NULL;
+#endif
     zh->dict = NULL;
     zh->sortIdx = NULL;
     zh->zei = NULL;
@@ -187,26 +203,27 @@ static int zebra_register_lock (ZebraHandle zh)
 	    logf (LOG_WARN, "sortIdx_open");
 	    zh->errCode = 2;
 	}
-	if (res_get_match (zh->res, "isam", "i", NULL))
+	if (res_get_match (zh->res, "isam", "s", ISAM_DEFAULT))
 	{
-	    if (!(zh->isam = is_open (zh->bfs, FNAME_ISAM, key_compare, 0,
-				      sizeof (struct it_key), zh->res)))
+	    struct ISAMS_M_s isams_m;
+	    if (!(zh->isams = isams_open (zh->bfs, FNAME_ISAMS, 0,
+					  key_isams_m(zh->res, &isams_m))))
 	    {
-		logf (LOG_WARN, "is_open");
+		logf (LOG_WARN, "isams_open");
 		zh->errCode = 2;
 	    }
 	}
-	else if (res_get_match (zh->res, "isam", "s", NULL))
+#if ZMBOL
+	else if (res_get_match (zh->res, "isam", "i", ISAM_DEFAULT))
 	{
-	    struct ISAMS_M_s isams_m;
-	    if (!(zh->isams = isams_open (zh->bfs, FNAME_ISAMS, 0,
-					  key_isams_m(zh->res, &isams_m))))
+	    if (!(zh->isam = is_open (zh->bfs, FNAME_ISAM, key_compare, 0,
+				      sizeof (struct it_key), zh->res)))
 	    {
-		logf (LOG_WARN, "isams_open");
+		logf (LOG_WARN, "is_open");
 		zh->errCode = 2;
 	    }
 	}
-	else
+	else if (res_get_match (zh->res, "isam", "c", ISAM_DEFAULT))
 	{
 	    struct ISAMC_M_s isamc_m;
 	    if (!(zh->isamc = isc_open (zh->bfs, FNAME_ISAMC,
@@ -216,6 +233,7 @@ static int zebra_register_lock (ZebraHandle zh)
 		zh->errCode = 2;
 	    }
 	}
+#endif
 	zh->zei = zebraExplain_open (zh->records, zh->dh, zh->res, 0, 0, 0);
 	if (!zh->zei)
 	{
@@ -272,7 +290,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;
@@ -309,16 +340,18 @@ void zebra_close (ZebraHandle zh)
     zebra_chdir (zh);
     if (zh->records)
     {
-        resultSetDestroy (zh);
+        resultSetDestroy (zh, -1, 0, 0);
         zebraExplain_close (zh->zei, 0, 0);
         dict_close (zh->dict);
 	sortIdx_close (zh->sortIdx);
+	if (zh->isams)
+	    isams_close (zh->isams);
+#if ZMBOL
         if (zh->isam)
             is_close (zh->isam);
         if (zh->isamc)
             isc_close (zh->isamc);
-	if (zh->isams)
-	    isams_close (zh->isams);
+#endif
         rec_close (&zh->records);
         zebra_register_unlock (zh);
     }
@@ -333,7 +366,6 @@ void zebra_close (ZebraHandle zh)
 	passwd_db_close (zh->passwd_db);
     res_close (zh->res);
     xfree (zh);
-    xmalloc_trav("x");
 }
 
 struct map_baseinfo {
@@ -498,6 +530,30 @@ void zebra_sort (ZebraHandle zh, ODR stream,
     zebra_register_unlock (zh);
 }
 
+int zebra_deleleResultSet(ZebraHandle zh, int function,
+			  int num_setnames, char **setnames,
+			  int *statuses)
+{
+    int i, status;
+    if (zebra_register_lock (zh))
+	return Z_DeleteStatus_systemProblemAtTarget;
+    switch (function)
+    {
+    case Z_DeleteRequest_list:
+	resultSetDestroy (zh, num_setnames, setnames, statuses);
+	break;
+    case Z_DeleteRequest_all:
+	resultSetDestroy (zh, -1, 0, statuses);
+	break;
+    }
+    zebra_register_unlock (zh);
+    status = Z_DeleteStatus_success;
+    for (i = 0; i<num_setnames; i++)
+	if (statuses[i] == Z_DeleteStatus_resultSetDidNotExist)
+	    status = statuses[i];
+    return status;
+}
+
 int zebra_errCode (ZebraHandle zh)
 {
     return zh->errCode;