X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fsrwutil.c;h=47af17829cea89fa4fb0e7612b42f159e0dcfda0;hp=0257c9c71cac649a0a3dd6566e07bea6e23c8033;hb=8dc67a9430644549801c18ec7e3a725e5a4ef782;hpb=5443d85bcd6ac9a3ca444586ab7a83c3ba85bc6b

diff --git a/src/srwutil.c b/src/srwutil.c
index 0257c9c..47af178 100644
--- a/src/srwutil.c
+++ b/src/srwutil.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2004, Index Data.
  * See the file LICENSE for details.
  *
- * $Id: srwutil.c,v 1.9 2004-01-09 19:54:05 adam Exp $
+ * $Id: srwutil.c,v 1.15 2004-03-24 10:14:24 adam Exp $
  */
 
 #include <yaz/srw.h>
@@ -131,6 +131,18 @@ void yaz_uri_val_int(const char *path, const char *name, ODR o, int **intp)
         *intp = odr_intdup(o, atoi(v));
 }
 
+void yaz_mk_std_diagnostic(ODR o, Z_SRW_diagnostic *d, 
+			   int code, const char *details)
+{
+    d->uri = (char *) odr_malloc(o, 50);
+    sprintf(d->uri, "info:srw/diagnostic/1/%d", code);
+    d->message = 0;
+    if (details)
+	d->details = odr_strdup(o, details);
+    else
+	d->details = 0;
+}
+
 void yaz_add_srw_diagnostic(ODR o, Z_SRW_diagnostic **d,
 			    int *num, int code, const char *addinfo)
 {
@@ -139,11 +151,8 @@ void yaz_add_srw_diagnostic(ODR o, Z_SRW_diagnostic **d,
     if (*num)
 	memcpy (d_new, *d, *num *sizeof(**d));
     *d = d_new;
-    (*d + *num)->code = odr_intdup(o, code);
-    if (addinfo)
-	(*d + *num)->details = odr_strdup(o, addinfo);
-    else
-	(*d + *num)->details = 0;
+
+    yaz_mk_std_diagnostic(o, *d + *num, code, addinfo);
     (*num)++;
 }
 
@@ -245,7 +254,7 @@ int yaz_sru_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
 	char *scanClause = 0;
 	char *recordXPath = 0;
 	char *recordSchema = 0;
-	char *recordPacking = "xml";
+	char *recordPacking = "xml";  /* xml packing is default for SRU */
 	char *maximumRecords = 0;
 	char *startRecord = 0;
 	char **uri_name;
@@ -298,7 +307,7 @@ int yaz_sru_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
 		else if (!strcmp(n, "startRecord"))
 		    startRecord = v;
 		else
-		    yaz_add_srw_diagnostic(decode, diag, num_diag, 9, n);
+		    yaz_add_srw_diagnostic(decode, diag, num_diag, 8, n);
 	    }
 	}
 	if (!version)
@@ -536,15 +545,14 @@ static struct {
 {5, "Unsupported version"},
 {6, "Unsupported parameter value"},
 {7, "Mandatory parameter not supplied"},
-{8, "Unknown database"},
-{9, "Unknown parameter type"},
+{8, "Unsupported parameter"},
 /* Diagnostics Relating to CQL */
 {10, "Query syntax error"}, 
 {11, "Unsupported query type"}, 
 {12, "Too many characters in query"}, 
 {13, "Invalid or unsupported use of parentheses"}, 
 {14, "Invalid or unsupported use of quotes"}, 
-{15, "Unsupported context context set"}, 
+{15, "Unsupported context set"}, 
 {16, "Unsupported index"}, 
 {17, "Unsupported combination of index and context set"}, 
 {18, "Unsupported combination of indexes"}, 
@@ -694,7 +702,7 @@ static int srw_bib1_map[] = {
     108, 27,
     108, 45,
         
-    109, 9,
+    109, 2,
     110, 37,
     111, 1,
     112, 58,
@@ -703,6 +711,7 @@ static int srw_bib1_map[] = {
     115, 16,
     116, 16,
     117, 19,
+    117, 20,
     118, 22,
     119, 32,
     119, 31,