X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebraapi.c;h=7caf21a3166d9a045fa68ea9e5be42271c30f5c7;hp=10a7ef76e42abbe902179a80a79d15ef6e4526a2;hb=3f45c68ea8b1d3a3e9c5b3a014b3d001e89c46eb;hpb=85a2a0b28cb516d28ac70b7824f2b7d4b07e56ae

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 10a7ef7..7caf21a 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -4,7 +4,17 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zebraapi.c,v $
- * Revision 1.2  1998-05-20 10:12:19  adam
+ * Revision 1.5  1998-06-13 00:14:08  adam
+ * Minor changes.
+ *
+ * Revision 1.4  1998/06/12 12:22:12  adam
+ * Work on Zebra API.
+ *
+ * Revision 1.3  1998/05/27 16:57:44  adam
+ * Zebra returns surrogate diagnostic for single records when
+ * appropriate.
+ *
+ * Revision 1.2  1998/05/20 10:12:19  adam
  * Implemented automatic EXPLAIN database maintenance.
  * Modified Zebra to work with ASN.1 compiled version of YAZ.
  *
@@ -22,6 +32,7 @@
 #include <unistd.h>
 #endif
 
+#include <diagbib1.h>
 #include "zserver.h"
 
 static int zebra_register_lock (ZebraHandle zh)
@@ -119,7 +130,7 @@ static void zebra_register_unlock (ZebraHandle zh)
         zebra_server_unlock (zh, zh->registerState);
 }
 
-ZebraHandle zebra_open (const char *host, const char *configName)
+ZebraHandle zebra_open (const char *configName)
 {
     ZebraHandle zh = xmalloc (sizeof(*zh));
 
@@ -140,6 +151,8 @@ ZebraHandle zebra_open (const char *host, const char *configName)
     zh->records = NULL;
     zh->zebra_maps = zebra_maps_open (zh->res);
     zh->rank_classes = NULL;
+    zh->errCode = 0;
+    zh->errString = 0;
     
     zebraRankInstall (zh, rank1_class);
     return zh;
@@ -190,7 +203,9 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream,
     ZebraPosSet poset;
     int i, *pos_array;
 
-    pos_array = xmalloc (sizeof(*pos_array));
+    zh->errCode = 0;
+    zh->errString = NULL;
+    pos_array = xmalloc (num_recs * sizeof(*pos_array));
     for (i = 0; i<num_recs; i++)
 	pos_array[i] = recs[i].position;
 
@@ -213,12 +228,13 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream,
 	    }
 	    else
 	    {
-		zh->errCode =
+		recs[i].errCode =
 		    zebra_record_fetch (zh, poset[i].sysno, poset[i].score,
 					stream, input_format, comp,
 					&recs[i].format, &recs[i].buf,
 					&recs[i].len,
 					&recs[i].base);
+		recs[i].errString = NULL;
 	    }
 	}
 	zebraPosSetDestroy (zh, poset, num_recs);
@@ -233,6 +249,8 @@ void zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 		 int *position, int *num_entries, ZebraScanEntry **entries,
 		 int *is_partial)
 {
+    zh->errCode = 0;
+    zh->errString = NULL;
     zebra_register_lock (zh);
     rpn_scan (zh, stream, zapt, attributeset,
 	      num_bases, basenames, position,
@@ -245,12 +263,34 @@ void zebra_sort (ZebraHandle zh, ODR stream,
 		 char *output_setname, Z_SortKeySpecList *sort_sequence,
 		 int *sort_status)
 {
+    zh->errCode = 0;
+    zh->errString = NULL;
     zebra_register_lock (zh);
     resultSetSort (zh, stream, num_input_setnames, input_setnames,
 		   output_setname, sort_sequence, sort_status);
     zebra_register_unlock (zh);
 }
 
+int zebra_errCode (ZebraHandle zh)
+{
+    return zh->errCode;
+}
+
+const char *zebra_errString (ZebraHandle zh)
+{
+    return diagbib1_str (zh->errCode);
+}
+
+char *zebra_errAdd (ZebraHandle zh)
+{
+    return zh->errString;
+}
+
+int zebra_hits (ZebraHandle zh)
+{
+    return zh->hits;
+}
+
 void zebra_setDB (ZebraHandle zh, int num_bases, char **basenames)
 {