X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fseshigh.c;h=9906fa44016af81400bb57e09aeeaca2aa6790c0;hb=97554b23cfc19394bb77f7f3c4bf0c8abf89297b;hp=08f5c32f245aa0152ae34d831ced2084f5c7529c;hpb=073195289eb9b73d6793fa283e5a7dca7a24fba8;p=yaz-moved-to-github.git

diff --git a/src/seshigh.c b/src/seshigh.c
index 08f5c32..9906fa4 100644
--- a/src/seshigh.c
+++ b/src/seshigh.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2004, Index Data
  * See the file LICENSE for details.
  *
- * $Id: seshigh.c,v 1.16 2004-01-09 18:10:31 adam Exp $
+ * $Id: seshigh.c,v 1.20 2004-02-14 15:58:42 adam Exp $
  */
 
 /*
@@ -631,9 +631,8 @@ static void srw_bend_search(association *assoc, request *req,
         srw_res->num_diagnostics = 1;
         srw_res->diagnostics = (Z_SRW_diagnostic *)
 	    odr_malloc(assoc->encode, sizeof(*srw_res->diagnostics));
-        srw_res->diagnostics[0].code = 
-            odr_intdup(assoc->encode, srw_error);
-        srw_res->diagnostics[0].details = 0;
+	yaz_mk_std_diagnostic(assoc->encode,
+			      srw_res->diagnostics, srw_error, 0);
         return;
     }
     
@@ -661,13 +660,11 @@ static void srw_bend_search(association *assoc, request *req,
         srw_res->num_diagnostics = 1;
         srw_res->diagnostics = (Z_SRW_diagnostic *)
 	    odr_malloc(assoc->encode, sizeof(*srw_res->diagnostics));
-        srw_res->diagnostics[0].code = 
-            odr_intdup(assoc->encode, 
-                       yaz_diag_bib1_to_srw (rr.errcode));
-        srw_res->diagnostics[0].details = rr.errstring;
-        yaz_log(LOG_DEBUG, "srw_bend_search returned SRW error %d",
-                *srw_res->diagnostics[0].code);
-                
+	yaz_mk_std_diagnostic(assoc->encode, srw_res->diagnostics,
+			      yaz_diag_bib1_to_srw (rr.errcode),
+			      rr.errstring);
+        yaz_log(LOG_DEBUG, "srw_bend_search returned SRW error %s",
+                srw_res->diagnostics[0].uri);
     }
     else
     {
@@ -713,10 +710,11 @@ static void srw_bend_search(association *assoc, request *req,
                         srw_res->diagnostics = (Z_SRW_diagnostic *)
                             odr_malloc(assoc->encode, 
                                        sizeof(*srw_res->diagnostics));
-                        srw_res->diagnostics[0].code = 
-                            odr_intdup(assoc->encode, 
-                                       yaz_diag_bib1_to_srw (errcode));
-                        srw_res->diagnostics[0].details = rr.errstring;
+
+			yaz_mk_std_diagnostic(assoc->encode, 
+					      srw_res->diagnostics,
+					      yaz_diag_bib1_to_srw (errcode),
+					      rr.errstring);
                         break;
                     }
                     if (srw_res->records[j].recordData_buf)
@@ -775,21 +773,36 @@ static void process_http_request(association *assoc, request *req)
 {
     Z_HTTP_Request *hreq = req->gdu_request->u.HTTP_Request;
     ODR o = assoc->encode;
-    int r;
+    int r = 2;  /* 2=NOT TAKEN, 1=TAKEN, 0=SOAP TAKEN */
     Z_SRW_PDU *sr = 0;
     Z_SOAP *soap_package = 0;
     Z_GDU *p = 0;
     char *charset = 0;
-    Z_HTTP_Response *hres;
+    Z_HTTP_Response *hres = 0;
     int keepalive = 1;
     char *stylesheet = 0;
     Z_SRW_diagnostic *diagnostic = 0;
     int num_diagnostic = 0;
 
-    r = yaz_srw_decode(hreq, &sr, &soap_package, assoc->decode, &charset);
+    if (!strcmp(hreq->path, "/test")) 
+    {	
+	p = z_get_HTTP_Response(o, 200);
+	hres = p->u.HTTP_Response;
+	hres->content_buf = "1234567890\n";
+	hres->content_len = strlen(hres->content_buf);
+	r = 1;
+    }
+    if (r == 2)
+    {
+	r = yaz_srw_decode(hreq, &sr, &soap_package, assoc->decode, &charset);
+	yaz_log(LOG_DEBUG, "yaz_srw_decode returned %d", r);
+    }
     if (r == 2)  /* not taken */
+    {
 	r = yaz_sru_decode(hreq, &sr, &soap_package, assoc->decode, &charset,
 			   &diagnostic, &num_diagnostic);
+	yaz_log(LOG_DEBUG, "yaz_sru_decode returned %d", r);
+    }
     if (r == 0)  /* decode SRW/SRU OK .. */
     {
 	int http_code = 200;
@@ -879,7 +892,8 @@ static void process_http_request(association *assoc, request *req)
 	else
 	    p = z_get_HTTP_Response(o, http_code);
     }
-    else
+
+    if (p == 0)
 	p = z_get_HTTP_Response(o, 500);
     hres = p->u.HTTP_Response;
     if (!strcmp(hreq->version, "1.0")) 
@@ -1176,7 +1190,8 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
     {
         Z_CharSetandLanguageNegotiation *negotiation =
             yaz_get_charneg_record (req->otherInfo);
-        if (negotiation->which == Z_CharSetandLanguageNegotiation_proposal)
+        if (negotiation &&
+	    negotiation->which == Z_CharSetandLanguageNegotiation_proposal)
             assoc->init->charneg_request = negotiation;
     }
     
@@ -1270,7 +1285,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
     if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1))
     {
     	ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_1);
-	assoc->version = 2; /* 1 & 2 are equivalent */
+	assoc->version = 1; /* 1 & 2 are equivalent */
     }
     if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_2))
     {
@@ -1302,7 +1317,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
 		assoc->init->implementation_name,
 		odr_prepend(assoc->encode, "GFS", resp->implementationName));
 
-    version = odr_strdup(assoc->encode, "$Revision: 1.16 $");
+    version = odr_strdup(assoc->encode, "$Revision: 1.20 $");
     if (strlen(version) > 10)	/* check for unexpanded CVS strings */
 	version[strlen(version)-2] = '\0';
     resp->implementationVersion = odr_prepend(assoc->encode,
@@ -1546,7 +1561,8 @@ static Z_Records *pack_records(association *a, char *setname, int start,
 	    this_length = odr_total(a->encode) - total_length - dumped_records;
 	yaz_log(LOG_DEBUG, "  fetched record, len=%d, total=%d dumped=%d",
 	    this_length, total_length, dumped_records);
-	if (this_length + total_length > a->preferredMessageSize)
+	if (a->preferredMessageSize > 0 &&
+		this_length + total_length > a->preferredMessageSize)
 	{
 	    /* record is small enough, really */
 	    if (this_length <= a->preferredMessageSize && recno > start)