X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=788b92941cdd0049315bc66fe6c8b0290bf66231;hp=c7833eb6233d2ec4c41d93a83ee110ca7fc5a5b5;hb=9e52fe3b352579982d63ec09711cff6c4b49de30;hpb=f024b7a1fa4b9d56730b12aba0f3a1975bcfc577

diff --git a/SimpleServer.xs b/SimpleServer.xs
index c7833eb..788b929 100644
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -1,5 +1,5 @@
 /*
- * $Id: SimpleServer.xs,v 1.72 2007-08-17 16:45:22 mike Exp $ 
+ * $Id: SimpleServer.xs,v 1.79 2007-09-10 14:50:31 mike Exp $ 
  * ----------------------------------------------------------------------
  * 
  * Copyright (c) 2000-2004, Index Data.
@@ -424,9 +424,10 @@ static SV *apt2perl(Z_AttributesPlusTerm *at)
 		setMember(hv2, "attributeValue",
 			  newSViv(*elem->value.numeric));
 	    } else {
-		assert(elem->which == Z_AttributeValue_complex);
-		Z_ComplexAttribute *c = elem->value.complex;
+		Z_ComplexAttribute *c;
 		Z_StringOrNumeric *son;
+		assert(elem->which == Z_AttributeValue_complex);
+		c = elem->value.complex;
 		/* We ignore semantic actions and multiple values */
 		assert(c->num_list > 0);
 		son = c->list[0];
@@ -464,13 +465,12 @@ static SV *rpn2perl(Z_RPNStructure *s)
 	       idea why.  It seems as clear as day to me */
 	    SV *sv2;
 	    char *rsid = (char*) o->u.resultSetId;
-	    printf("Encoding resultSetId '%s'\n", rsid);
+	    /*printf("Encoding resultSetId '%s'\n", rsid);*/
 	    sv = newObject("Net::Z3950::RPN::RSID", (SV*) (hv = newHV()));
-	    printf("Made sv=0x%lx, hv=0x%lx\n",
-		   (unsigned long) sv ,(unsigned long) hv);
+	    /*printf("Made sv=0x%lx, hv=0x%lx\n", (unsigned long) sv ,(unsigned long) hv);*/
 	    sv2 = newSVpv(rsid, strlen(rsid));
 	    setMember(hv, "id", sv2);
-	    printf("Set hv{id} to 0x%lx\n", (unsigned long) sv2);
+	    /*printf("Set hv{id} to 0x%lx\n", (unsigned long) sv2);*/
 	    return sv;
 	}
 
@@ -825,6 +825,78 @@ int bend_search(void *handle, bend_search_rr *rr)
 }
 
 
+/* ### I am not 100% about the memory management in this handler */
+int bend_delete(void *handle, bend_delete_rr *rr)
+{
+	Zfront_handle *zhandle = (Zfront_handle *)handle;
+	HV *href;
+	CV* handler_cv;
+	int i;
+	SV **temp;
+	SV *point;
+
+	dSP;
+	ENTER;
+	SAVETMPS;
+
+	href = newHV();
+	hv_store(href, "GHANDLE", 7, newSVsv(zhandle->ghandle), 0);
+	hv_store(href, "HANDLE", 6, zhandle->handle, 0);
+	hv_store(href, "STATUS", 6, newSViv(0), 0);
+
+	PUSHMARK(sp);
+	XPUSHs(sv_2mortal(newRV( (SV*) href)));
+	PUTBACK;
+
+	handler_cv = simpleserver_sv2cv(delete_ref);
+
+	if (rr->function == 1) {
+	    /* Delete all result sets in the session */
+	    perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
+	    temp = hv_fetch(href, "STATUS", 6, 1);
+	    rr->delete_status = SvIV(*temp);
+	} else {
+	    rr->delete_status = 0;
+	    /*
+	     * For some reason, deleting two or more result-sets in
+	     * one operation goes horribly wrong, and ### I don't have
+	     * time to debug it right now.
+	     */
+	    if (rr->num_setnames > 1) {
+		rr->delete_status = 3; /* "System problem at target" */
+		/* There's no way to sent delete-msg using the GFS */
+		return;
+	    }
+
+	    for (i = 0; i < rr->num_setnames; i++) {
+		hv_store(href, "SETNAME", 7, newSVpv(rr->setnames[i], 0), 0);
+		perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
+		temp = hv_fetch(href, "STATUS", 6, 1);
+		rr->statuses[i] = SvIV(*temp);
+		if (rr->statuses[i] != 0)
+		    rr->delete_status = rr->statuses[i];
+	    }
+	}
+
+	SPAGAIN;
+
+	temp = hv_fetch(href, "HANDLE", 6, 1);
+	point = newSVsv(*temp);
+
+	hv_undef(href);
+
+	zhandle->handle = point;
+
+	sv_free( (SV*) href);	
+
+	PUTBACK;
+	FREETMPS;
+	LEAVE;
+
+	return 0;
+}
+
+
 int bend_fetch(void *handle, bend_fetch_rr *rr)
 {
 	HV *href;
@@ -895,6 +967,8 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 			else
 			{
 				rr->errcode = 26;
+				rr->errstring = odr_strdup(rr->stream, "non-generic 'simple' composition");
+				return 0;
 			}
 		}
 		else if (composition->which == Z_RecordComp_complex)
@@ -913,8 +987,8 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 			else
 			{
 #if 0	/* For now ignore this error, which is ubiquitous in SRU */
-				fprintf(stderr, "complex is weird\n");
 				rr->errcode = 26;
+				rr->errstring = odr_strdup(rr->stream, "'complex' composition is not generic ESN");
 				return 0;
 #endif /*0*/
 			}
@@ -922,6 +996,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 		else
 		{
 			rr->errcode = 26;
+			rr->errstring = odr_strdup(rr->stream, "composition neither simple nor complex");
 			return 0;
 		}
 	}
@@ -1086,6 +1161,7 @@ int bend_present(void *handle, bend_present_rr *rr)
 			else
 			{
 				rr->errcode = 26;
+				rr->errstring = odr_strdup(rr->stream, "non-generic 'simple' composition");
 				return 0;
 			}
 		}
@@ -1105,12 +1181,14 @@ int bend_present(void *handle, bend_present_rr *rr)
 			else
 			{
 				rr->errcode = 26;
+				rr->errstring = odr_strdup(rr->stream, "'complex' composition is not generic ESN");
 				return 0;
 			}
 		}
 		else
 		{
 			rr->errcode = 26;
+			rr->errstring = odr_strdup(rr->stream, "composition neither simple nor complex");
 			return 0;
 		}
 	}
@@ -1169,13 +1247,6 @@ int bend_esrequest(void *handle, bend_esrequest_rr *rr)
 }
 
 
-int bend_delete(void *handle, bend_delete_rr *rr)
-{
-	perl_call_sv(delete_ref, G_VOID | G_DISCARD | G_NOARGS);
-	return 0;
-}
-
-
 int bend_scan(void *handle, bend_scan_rr *rr)
 {
         HV *href;
@@ -1393,7 +1464,9 @@ bend_initresult *bend_init(bend_initrequest *q)
 		q->bend_present = bend_present;
 	}
 	/*q->bend_esrequest = bend_esrequest;*/
-	/*q->bend_delete = bend_delete;*/
+	if (delete_ref) {
+		q->bend_delete = bend_delete;
+	}
 	if (fetch_ref)
 	{
 		q->bend_fetch = bend_fetch;