X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=47189122b59d27c8b9c69ea40c591b26a31abeef;hb=4247c4670f5bc5ad61e458734a590d57be5a9f34;hp=a6ecfd3bb6566a4d1998af25158bb3370485d0a0;hpb=ce3907338568fce46c5751e7e1091a5ad1c8e291;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index a6ecfd3..4718912 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -4,7 +4,20 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.c,v $
- * Revision 1.56  1998-03-05 08:45:13  adam
+ * Revision 1.60  1998-06-22 11:36:49  adam
+ * Added authentication check facility to zebra.
+ *
+ * Revision 1.59  1998/06/12 12:22:13  adam
+ * Work on Zebra API.
+ *
+ * Revision 1.58  1998/05/27 16:57:46  adam
+ * Zebra returns surrogate diagnostic for single records when
+ * appropriate.
+ *
+ * Revision 1.57  1998/04/03 14:45:18  adam
+ * Fixed setting of last_in_set in bend_fetch.
+ *
+ * Revision 1.56  1998/03/05 08:45:13  adam
  * New result set model and modular ranking system. Moved towards
  * descent server API. System information stored as "SGML" records.
  *
@@ -228,6 +241,8 @@ bend_initresult *bend_init (bend_initrequest *q)
     bend_initresult *r = odr_malloc (q->stream, sizeof(*r));
     ZebraHandle zh;
     struct statserv_options_block *sob;
+    char *user = NULL;
+    char *passwd = NULL;
 
     r->errcode = 0;
     r->errstring = 0;
@@ -236,12 +251,34 @@ bend_initresult *bend_init (bend_initrequest *q)
     logf (LOG_DEBUG, "bend_init");
 
     sob = statserv_getcontrol ();
-    if (!(zh = zebra_open (NULL, sob->configname)))
+    if (!(zh = zebra_open (sob->configname)))
     {
 	logf (LOG_FATAL, "Failed to open Zebra `%s'", sob->configname);
 	r->errcode = 1;
 	return r;
     }
+    if (q->auth)
+    {
+	if (q->auth->which == Z_IdAuthentication_open)
+	{
+	    char *openpass = xstrdup (q->auth->u.open);
+	    char *cp = strchr (openpass, '/');
+	    if (cp)
+	    {
+		*cp = '\0';
+		user = nmem_strdup (odr_getmem (q->stream), openpass);
+		passwd = nmem_strdup (odr_getmem (q->stream), cp+1);
+	    }
+	    xfree (openpass);
+	}
+    }
+    if (zebra_auth (zh, user, passwd))
+    {
+	r->errcode = 222;
+	r->errstring = user;
+	zebra_close (zh);
+	return r;
+    }
     r->handle = zh;
     return r;
 }
@@ -279,15 +316,22 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num)
 
     retrievalRecord.position = q->number;
     
+    r->last_in_set = 0;
     zebra_records_retrieve (zh, q->stream, q->setname, q->comp,
 			    q->format, 1, &retrievalRecord);
-
-    if (zh->errCode)
+    if (zh->errCode)                  /* non Surrogate Diagnostic */
     {
 	r->errcode = zh->errCode;
 	r->errstring = zh->errString;
     }
-    else
+    else if (retrievalRecord.errCode) /* Surrogate Diagnostic */
+    {
+	q->surrogate_flag = 1;
+	r->errcode = retrievalRecord.errCode;
+	r->errstring = retrievalRecord.errString;
+	r->basename = retrievalRecord.base;
+    }
+    else                              /* Database Record */
     {
 	r->errcode = 0;
 	r->basename = retrievalRecord.base;