X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=SimpleServer.xs;h=59ac45f833667b50242efd5eb516ed21b7551d52;hb=b240782240b3b41053423a301c071b0fc2d11f71;hp=e3370bde0234bb0bb78e9ff7d2c0a6134a0ef393;hpb=49c233671c73a64f891026ddb93b0eba158461d4;p=simpleserver-moved-to-github.git

diff --git a/SimpleServer.xs b/SimpleServer.xs
index e3370bd..59ac45f 100644
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -1,5 +1,5 @@
 /*
- * $Id: SimpleServer.xs,v 1.75 2007-08-20 16:46:05 mike Exp $ 
+ * $Id: SimpleServer.xs,v 1.82 2008-08-29 18:58:40 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];
@@ -832,6 +833,7 @@ int bend_delete(void *handle, bend_delete_rr *rr)
 	CV* handler_cv;
 	int i;
 	SV **temp;
+	SV *point;
 
 	dSP;
 	ENTER;
@@ -849,12 +851,23 @@ int bend_delete(void *handle, bend_delete_rr *rr)
 	handler_cv = simpleserver_sv2cv(delete_ref);
 
 	if (rr->function == 1) {
-	    /* Delete all result setss in the session */
+	    /* 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 0;
+	    }
+
 	    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);
@@ -867,6 +880,13 @@ int bend_delete(void *handle, bend_delete_rr *rr)
 
 	SPAGAIN;
 
+	temp = hv_fetch(href, "HANDLE", 6, 1);
+	point = newSVsv(*temp);
+
+	hv_undef(href);
+
+	zhandle->handle = point;
+
 	sv_free( (SV*) href);	
 
 	PUTBACK;
@@ -947,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)
@@ -965,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*/
 			}
@@ -974,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;
 		}
 	}
@@ -1138,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;
 			}
 		}
@@ -1157,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;
 		}
 	}
@@ -1455,9 +1481,12 @@ bend_initresult *bend_init(bend_initrequest *q)
 	}
 
        	href = newHV();	
+
+	/* ### These should be given initial values from the client */
 	hv_store(href, "IMP_ID", 6, newSVpv("", 0), 0);
 	hv_store(href, "IMP_NAME", 8, newSVpv("", 0), 0);
 	hv_store(href, "IMP_VER", 7, newSVpv("", 0), 0);
+
 	hv_store(href, "ERR_CODE", 8, newSViv(0), 0);
 	hv_store(href, "ERR_STR", 7, newSViv(0), 0);
 	hv_store(href, "PEER_NAME", 9, newSVpv(q->peer_name, 0), 0);