X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fseshigh.c;h=9906fa44016af81400bb57e09aeeaca2aa6790c0;hb=317ee76a1bbe9de384aea464c829b8ad627518a2;hp=3395c8b55a358adb9a339831d0ae8848ab03136b;hpb=76bd6780cebee47ffefa4170fa2daa1f079d9559;p=yaz-moved-to-github.git

diff --git a/src/seshigh.c b/src/seshigh.c
index 3395c8b..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.17 2004-01-15 10:16:27 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)
@@ -1319,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.17 $");
+    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,
@@ -1563,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)