X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=9afe88a5130aeaae1d24a0b2cea95cc7aef2e14e;hb=eb2b742588ce07fb4516bbca22c93b938b13e433;hp=bc7bf1872867e714ac5540a3568aa624d6b06ce3;hpb=d0276ba178f8bdd1ccad216d8b4ec9af832b0cf7;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index bc7bf18..9afe88a 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -1,10 +1,62 @@
 /*
- * Copyright (C) 1995-1998, Index Data I/S 
+ * Copyright (C) 1995-1999, Index Data 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.c,v $
- * Revision 1.59  1998-06-12 12:22:13  adam
+ * Revision 1.76  2000-03-15 15:00:31  adam
+ * First work on threaded version.
+ *
+ * Revision 1.75  1999/11/30 13:48:04  adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.74  1999/11/29 15:13:26  adam
+ * Server sets implementationName - and Version.
+ *
+ * Revision 1.73  1999/11/04 15:00:45  adam
+ * Implemented delete result set(s).
+ *
+ * Revision 1.71  1999/07/14 10:59:26  adam
+ * Changed functions isc_getmethod, isams_getmethod.
+ * Improved fatal error handling (such as missing EXPLAIN schema).
+ *
+ * Revision 1.70  1999/06/10 12:14:56  adam
+ * Fixed to use bend_start instead of pre_init.
+ *
+ * Revision 1.69  1999/06/10 09:20:03  adam
+ * Minor change to pre_init handler.
+ *
+ * Revision 1.68  1999/05/26 07:49:13  adam
+ * C++ compilation.
+ *
+ * Revision 1.67  1999/02/02 14:51:14  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.66  1998/10/28 10:54:41  adam
+ * SDRKit integration.
+ *
+ * Revision 1.65  1998/10/18 07:54:54  adam
+ * Additional info added for diagnostics 114 (Unsupported use attribute) and
+ * 121 (Unsupported attribute set).
+ *
+ * Revision 1.64  1998/09/22 10:48:21  adam
+ * Minor changes in search API.
+ *
+ * Revision 1.63  1998/09/02 13:53:21  adam
+ * Extra parameter decode added to search routines to implement
+ * persistent queries.
+ *
+ * Revision 1.62  1998/08/06 14:35:28  adam
+ * Routine bend_deleterequest removed.
+ *
+ * Revision 1.61  1998/06/24 12:16:15  adam
+ * Support for relations on text operands. Open range support in
+ * DFA module (i.e. [-j], [g-]).
+ *
+ * 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
@@ -219,47 +271,89 @@
 #include <stdio.h>
 #include <assert.h>
 #include <fcntl.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #include <process.h>
 #else
 #include <unistd.h>
 #endif
 
-#include <data1.h>
-#include <dmalloc.h>
+#include <yaz/data1.h>
+#ifdef ASN_COMPILED
+#include <yaz/ill.h>
+#endif
 
 #include "zserver.h"
 
+#ifndef ZEBRASDR
+#define ZEBRASDR 0
+#endif
+#if ZEBRASDR
+#include "zebrasdr.h"
+#endif
+
 static int bend_sort (void *handle, bend_sort_rr *rr);
+static int bend_delete (void *handle, bend_delete_rr *rr);
+static int bend_esrequest (void *handle, bend_esrequest_rr *rr);
 
 bend_initresult *bend_init (bend_initrequest *q)
 {
-    bend_initresult *r = odr_malloc (q->stream, sizeof(*r));
+    bend_initresult *r = (bend_initresult *)
+	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;
     q->bend_sort = bend_sort;
+    q->bend_delete = bend_delete;
+    q->bend_esrequest = bend_esrequest;
+
+    q->implementation_name = "Z'mbol Information Server";
+    q->implementation_version = "Z'mbol 1.0";
 
     logf (LOG_DEBUG, "bend_init");
 
     sob = statserv_getcontrol ();
-    if (!(zh = zebra_open (sob->configname)))
+    if (!(zh = zebra_open (sob->handle)))
     {
 	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->service, user, passwd))
+    {
+	r->errcode = 222;
+	r->errstring = user;
+	zebra_close (zh);
+	return r;
+    }
     r->handle = zh;
     return r;
 }
 
 bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd)
 {
-    ZebraHandle zh = handle;
-    bend_searchresult *r = odr_malloc (q->stream, sizeof(*r));
+    ZebraHandle zh = (ZebraHandle) handle;
+    bend_searchresult *r = (bend_searchresult *)
+	odr_malloc (q->stream, sizeof(*r));
 
     r->hits = 0;
     r->errcode = 0;
@@ -269,12 +363,16 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd)
     switch (q->query->which)
     {
     case Z_Query_type_1: case Z_Query_type_101:
-	zebra_search_rpn (zh, q->stream, q->query->u.type_1,
+	zebra_search_rpn (zh, q->decode, q->stream, q->query->u.type_1,
 			  q->num_bases, q->basenames, q->setname);
 	r->errcode = zh->errCode;
 	r->errstring = zh->errString;
 	r->hits = zh->hits;
         break;
+    case Z_Query_type_2:
+	r->errcode = 107;
+	r->errstring = "type-2";
+	break;
     default:
         r->errcode = 107;
     }
@@ -283,8 +381,9 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd)
 
 bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num)
 {
-    ZebraHandle zh = handle;
-    bend_fetchresult *r = odr_malloc (q->stream, sizeof(*r));
+    ZebraHandle zh = (ZebraHandle) handle;
+    bend_fetchresult *r = (bend_fetchresult *)
+	odr_malloc (q->stream, sizeof(*r));
     ZebraRetrievalRecord retrievalRecord;
 
     retrievalRecord.position = q->number;
@@ -315,22 +414,19 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num)
     return r;
 }
 
-bend_deleteresult *bend_delete (void *handle, bend_deleterequest *q, int *num)
-{
-    return 0;
-}
-
 bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num)
 {
     ZebraScanEntry *entries;
-    ZebraHandle zh = handle;
-    bend_scanresult *r = odr_malloc (q->stream, sizeof(*r));
+    ZebraHandle zh = (ZebraHandle) handle;
+    bend_scanresult *r = (bend_scanresult *)
+	odr_malloc (q->stream, sizeof(*r));
     int is_partial, i;
     
     r->term_position = q->term_position;
     r->num_entries = q->num_entries;
 
-    r->entries = odr_malloc (q->stream, sizeof(*r->entries) * q->num_entries);
+    r->entries = (struct scan_entry *)
+	odr_malloc (q->stream, sizeof(*r->entries) * q->num_entries);
     zebra_scan (zh, q->stream, q->term,
 		q->attributeset,
 		q->num_bases, q->basenames,
@@ -357,33 +453,339 @@ void bend_close (void *handle)
 
 int bend_sort (void *handle, bend_sort_rr *rr)
 {
-    ZebraHandle zh = handle;
+    ZebraHandle zh = (ZebraHandle) handle;
 
-    zebra_sort (zh, rr->stream, rr->num_input_setnames, rr->input_setnames,
+    zebra_sort (zh, rr->stream,
+                rr->num_input_setnames, (const char **) rr->input_setnames,
 		rr->output_setname, rr->sort_sequence, &rr->sort_status);
     rr->errcode = zh->errCode;
     rr->errstring = zh->errString;
     return 0;
 }
 
-#ifndef WINDOWS
-static void pre_init (struct statserv_options_block *sob)
+int bend_delete (void *handle, bend_delete_rr *rr)
+{
+    ZebraHandle zh = (ZebraHandle) handle;
+
+    rr->delete_status =	zebra_deleleResultSet(zh, rr->function,
+					      rr->num_setnames, rr->setnames,
+					      rr->statuses);
+    return 0;
+}
+
+static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r)
 {
-    char *pidfile = "zebrasrv.pid";
-    int fd = creat (pidfile, 0666);
+    switch (r->toKeep->which)
+    {
+    case Z_ESAdminOriginPartToKeep_reIndex:
+	yaz_log(LOG_LOG, "adm-reindex");
+	break;
+    case Z_ESAdminOriginPartToKeep_truncate:
+	yaz_log(LOG_LOG, "adm-truncate");
+	break;
+    case Z_ESAdminOriginPartToKeep_delete:
+	yaz_log(LOG_LOG, "adm-delete");
+	break;
+    case Z_ESAdminOriginPartToKeep_create:
+	yaz_log(LOG_LOG, "adm-create");
+	zebra_admin_create (zh, r->toKeep->databaseName);
+	break;
+    case Z_ESAdminOriginPartToKeep_import:
+	yaz_log(LOG_LOG, "adm-import");
+	break;
+    case Z_ESAdminOriginPartToKeep_refresh:
+	yaz_log(LOG_LOG, "adm-refresh");
+	break;
+    case Z_ESAdminOriginPartToKeep_commit:
+	yaz_log(LOG_LOG, "adm-commit");
+	break;
+    default:
+	yaz_log(LOG_LOG, "unknown admin");
+	zh->errCode = 1001;
+    }
+    if (r->toKeep->databaseName)
+    {
+	yaz_log(LOG_LOG, "database %s", r->toKeep->databaseName);
+    }
+    return 0;
+}
+
+static int es_admin (ZebraHandle zh, Z_Admin *r)
+{
+    switch (r->which)
+    {
+    case Z_Admin_esRequest:
+	es_admin_request (zh, r->u.esRequest);
+	break;
+    case Z_Admin_taskPackage:
+	yaz_log (LOG_LOG, "adm taskpackage (unhandled)");
+	break;
+    default:
+	zh->errCode = 1001;
+	break;
+    }
+
+    return 0;
+}
+
+int bend_esrequest (void *handle, bend_esrequest_rr *rr)
+{
+    ZebraHandle zh = (ZebraHandle) handle;
     
-    if (fd == -1)
-	logf (LOG_WARN|LOG_ERRNO, "creat %s", pidfile);
+    yaz_log(LOG_LOG, "function: %d", *rr->esr->function);
+    if (rr->esr->packageName)
+    	yaz_log(LOG_LOG, "packagename: %s", rr->esr->packageName);
+    yaz_log(LOG_LOG, "Waitaction: %d", *rr->esr->waitAction);
+
+    if (!rr->esr->taskSpecificParameters)
+    {
+        yaz_log (LOG_WARN, "No task specific parameters");
+    }
+    else if (rr->esr->taskSpecificParameters->which == Z_External_ESAdmin)
+    {
+	es_admin (zh, rr->esr->taskSpecificParameters->u.adminService);
+	rr->errcode = zh->errCode;
+	rr->errstring = zh->errString;
+    }
+    else if (rr->esr->taskSpecificParameters->which == Z_External_itemOrder)
+    {
+    	Z_ItemOrder *it = rr->esr->taskSpecificParameters->u.itemOrder;
+	yaz_log (LOG_LOG, "Received ItemOrder");
+	switch (it->which)
+	{
+#ifdef ASN_COMPILED
+	case Z_IOItemOrder_esRequest:
+#else
+	case Z_ItemOrder_esRequest:
+#endif
+	{
+	    Z_IORequest *ir = it->u.esRequest;
+	    Z_IOOriginPartToKeep *k = ir->toKeep;
+	    Z_IOOriginPartNotToKeep *n = ir->notToKeep;
+	    
+	    if (k && k->contact)
+	    {
+	        if (k->contact->name)
+		    yaz_log(LOG_LOG, "contact name %s", k->contact->name);
+		if (k->contact->phone)
+		    yaz_log(LOG_LOG, "contact phone %s", k->contact->phone);
+		if (k->contact->email)
+		    yaz_log(LOG_LOG, "contact email %s", k->contact->email);
+	    }
+	    if (k->addlBilling)
+	    {
+	        yaz_log(LOG_LOG, "Billing info (not shown)");
+	    }
+	    
+	    if (n->resultSetItem)
+	    {
+	        yaz_log(LOG_LOG, "resultsetItem");
+		yaz_log(LOG_LOG, "setId: %s", n->resultSetItem->resultSetId);
+		yaz_log(LOG_LOG, "item: %d", *n->resultSetItem->item);
+	    }
+#ifdef ASN_COMPILED
+	    if (n->itemRequest)
+	    {
+		Z_External *r = (Z_External*) n->itemRequest;
+		ILL_ItemRequest *item_req = 0;
+		ILL_Request *ill_req = 0;
+		if (r->direct_reference)
+		{
+		    oident *ent = oid_getentbyoid(r->direct_reference);
+		    if (ent)
+			yaz_log(LOG_LOG, "OID %s", ent->desc);
+		    if (ent && ent->value == VAL_ISO_ILL_1)
+		    {
+			yaz_log (LOG_LOG, "ItemRequest");
+			if (r->which == ODR_EXTERNAL_single)
+			{
+			    odr_setbuf(rr->decode,
+				       r->u.single_ASN1_type->buf,
+				       r->u.single_ASN1_type->len, 0);
+			    
+			    if (!ill_ItemRequest (rr->decode, &item_req, 0, 0))
+			    {
+				yaz_log (LOG_LOG,
+                                    "Couldn't decode ItemRequest %s near %d",
+                                       odr_errmsg(odr_geterror(rr->decode)),
+                                       odr_offset(rr->decode));
+                                yaz_log(LOG_LOG, "PDU dump:");
+                                odr_dumpBER(log_file(),
+                                     r->u.single_ASN1_type->buf,
+                                     r->u.single_ASN1_type->len);
+                            }
+			    if (rr->print)
+			    {
+				ill_ItemRequest (rr->print, &item_req, 0,
+                                    "ItemRequest");
+				odr_reset (rr->print);
+ 			    }
+			}
+			if (!item_req && r->which == ODR_EXTERNAL_single)
+			{
+			    yaz_log (LOG_LOG, "ILLRequest");
+			    odr_setbuf(rr->decode,
+				       r->u.single_ASN1_type->buf,
+				       r->u.single_ASN1_type->len, 0);
+			    
+			    if (!ill_Request (rr->decode, &ill_req, 0, 0))
+			    {
+				yaz_log (LOG_LOG,
+                                    "Couldn't decode ILLRequest %s near %d",
+                                       odr_errmsg(odr_geterror(rr->decode)),
+                                       odr_offset(rr->decode));
+                                yaz_log(LOG_LOG, "PDU dump:");
+                                odr_dumpBER(log_file(),
+                                     r->u.single_ASN1_type->buf,
+                                     r->u.single_ASN1_type->len);
+                            }
+			    if (rr->print)
+                            {
+				ill_Request (rr->print, &ill_req, 0,
+                                    "ILLRequest");
+				odr_reset (rr->print);
+			    }
+			}
+		    }
+		}
+		if (item_req)
+		{
+		    yaz_log (LOG_LOG, "ILL protocol version = %d",
+			     *item_req->protocol_version_num);
+		}
+	    }
+#endif
+	}
+	break;
+	}
+    }
+    else if (rr->esr->taskSpecificParameters->which == Z_External_update)
+    {
+    	Z_IUUpdate *up = rr->esr->taskSpecificParameters->u.update;
+	yaz_log (LOG_LOG, "Received DB Update");
+	if (up->which == Z_IUUpdate_esRequest)
+	{
+	    Z_IUUpdateEsRequest *esRequest = up->u.esRequest;
+	    Z_IUOriginPartToKeep *toKeep = esRequest->toKeep;
+	    Z_IUSuppliedRecords *notToKeep = esRequest->notToKeep;
+	    
+	    yaz_log (LOG_LOG, "action");
+	    if (toKeep->action)
+	    {
+		switch (*toKeep->action)
+		{
+		case Z_IUOriginPartToKeep_recordInsert:
+		    yaz_log (LOG_LOG, " recordInsert");
+		    break;
+		case Z_IUOriginPartToKeep_recordReplace:
+		    yaz_log (LOG_LOG, " recordUpdate");
+		    break;
+		case Z_IUOriginPartToKeep_recordDelete:
+		    yaz_log (LOG_LOG, " recordDelete");
+		    break;
+		case Z_IUOriginPartToKeep_elementUpdate:
+		    yaz_log (LOG_LOG, " elementUpdate");
+		    break;
+		case Z_IUOriginPartToKeep_specialUpdate:
+		    yaz_log (LOG_LOG, " specialUpdate");
+		    break;
+		default:
+		    yaz_log (LOG_LOG, " unknown (%d)", *toKeep->action);
+		}
+	    }
+	    if (toKeep->databaseName)
+	    {
+		yaz_log (LOG_LOG, "database: %s", toKeep->databaseName);
+		if (!strcmp(toKeep->databaseName, "fault"))
+		{
+		    rr->errcode = 109;
+		    rr->errstring = toKeep->databaseName;
+		}
+		if (!strcmp(toKeep->databaseName, "accept"))
+		    rr->errcode = -1;
+	    }
+	    if (notToKeep)
+	    {
+		int i;
+		for (i = 0; i < notToKeep->num; i++)
+		{
+		    Z_External *rec = notToKeep->elements[i]->record;
+
+		    if (rec->direct_reference)
+		    {
+			struct oident *oident;
+			oident = oid_getentbyoid(rec->direct_reference);
+			if (oident)
+			    yaz_log (LOG_LOG, "record %d type %s", i,
+				     oident->desc);
+		    }
+		    switch (rec->which)
+		    {
+		    case Z_External_sutrs:
+			if (rec->u.octet_aligned->len > 170)
+			    yaz_log (LOG_LOG, "%d bytes:\n%.168s ...",
+				     rec->u.sutrs->len,
+				     rec->u.sutrs->buf);
+			else
+			    yaz_log (LOG_LOG, "%d bytes:\n%s",
+				     rec->u.sutrs->len,
+				     rec->u.sutrs->buf);
+                        break;
+		    case Z_External_octet        :
+			if (rec->u.octet_aligned->len > 170)
+			    yaz_log (LOG_LOG, "%d bytes:\n%.168s ...",
+				     rec->u.octet_aligned->len,
+				     rec->u.octet_aligned->buf);
+			else
+			    yaz_log (LOG_LOG, "%d bytes\n%s",
+				     rec->u.octet_aligned->len,
+				     rec->u.octet_aligned->buf);
+		    }
+		}
+	    }
+	}
+    }
     else
     {
-	char pidstr[30];
+        yaz_log (LOG_WARN, "Unknown Extended Service(%d)",
+		 rr->esr->taskSpecificParameters->which);
 	
-	sprintf (pidstr, "%ld", (long) getpid ());
-	write (fd, pidstr, strlen(pidstr));
-	close (fd);
     }
+    return 0;
 }
+
+static void bend_start (struct statserv_options_block *sob)
+{
+#ifdef WIN32
+    
+#else
+    if (!sob->inetd) 
+    {
+        char *pidfile = "zebrasrv.pid";
+        int fd = creat (pidfile, 0666);
+        if (fd == -1)
+            logf (LOG_WARN|LOG_ERRNO, "creat %s", pidfile);
+        else
+        {
+	    char pidstr[30];
+	
+	    sprintf (pidstr, "%ld", (long) getpid ());
+	    write (fd, pidstr, strlen(pidstr));
+	    close (fd);
+        }
+    }
 #endif
+    if (sob->handle)
+	zebra_stop((ZebraService) sob->handle);
+    sob->handle = zebra_start(sob->configname);
+}
+
+static void bend_stop(struct statserv_options_block *sob)
+{
+    if (sob->handle)
+	zebra_stop(sob->handle);
+    sob->handle = 0;
+}
 
 int main (int argc, char **argv)
 {
@@ -391,9 +793,14 @@ int main (int argc, char **argv)
 
     sob = statserv_getcontrol ();
     strcpy (sob->configname, FNAME_CONFIG);
-#ifndef WINDOWS
-    sob->pre_init = pre_init;
-#endif
+    sob->bend_start = bend_start;
+    sob->bend_stop = bend_stop;
+
+    if (sob->dynamic)
+    {
+	sob->dynamic = 0;
+	sob->threads = 1;
+    }
     statserv_setcontrol (sob);
 
     return statserv_main (argc, argv);