Fixed bug #176: Dont throw diagnostics on empty SRU args.

[yaz-moved-to-github.git] / src / srwutil.c

diff --git a/src/srwutil.c b/src/srwutil.c
index a7bc839..64292de 100644 (file)
--- 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.11 2004-01-27 21:22:44 adam Exp $
+ * $Id: srwutil.c,v 1.17 2004-10-09 08:49:55 adam Exp $
  */
 
 #include <yaz/srw.h>
@@ -98,7 +98,7 @@ char *yaz_uri_val(const char *path, const char *name, ODR o)
             p1 = strchr(path, '&');
             if (!p1)
                 p1 = strlen(path) + path;
-            ret = odr_malloc(o, p1 - path + 1);
+            ret = (char *) odr_malloc(o, p1 - path + 1);
             while (*path && *path != '&')
             {
                 if (*path == '+')
@@ -134,8 +134,8 @@ void yaz_uri_val_int(const char *path, const char *name, ODR o, int **intp)
 void yaz_mk_std_diagnostic(ODR o, Z_SRW_diagnostic *d, 
                           int code, const char *details)
 {
-    d->code = (char *) odr_malloc(o, 50);
-    sprintf(d->code, "info:srw/diagnostic/1/%d", code);
+    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);
@@ -254,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;
@@ -311,12 +311,17 @@ int yaz_sru_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
            }
        }
        if (!version)
-           yaz_add_srw_diagnostic(decode, diag, num_diag, 7, "version");
-       else if (version && strcmp(version, "1.1"))
+       {
+           if (uri_name)
+               yaz_add_srw_diagnostic(decode, diag, num_diag, 7, "version");
+           version = "1.1";
+       }
+       if (strcmp(version, "1.1"))
            yaz_add_srw_diagnostic(decode, diag, num_diag, 5, "1.1");
        if (!operation)
        {
-           yaz_add_srw_diagnostic(decode, diag, num_diag, 7, "operation");
+           if (uri_name)
+               yaz_add_srw_diagnostic(decode, diag, num_diag, 7, "operation");
            operation = "explain";
        }
         if (!strcmp(operation, "searchRetrieve"))
@@ -460,7 +465,7 @@ int yaz_sru_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
 
 Z_SRW_PDU *yaz_srw_get(ODR o, int which)
 {
-    Z_SRW_PDU *sr = odr_malloc(o, sizeof(*o));
+    Z_SRW_PDU *sr = (Z_SRW_PDU *) odr_malloc(o, sizeof(*o));
 
     sr->srw_version = odr_strdup(o, "1.1");
     sr->which = which;
@@ -552,7 +557,7 @@ static struct {
 {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"}, 
@@ -711,6 +716,7 @@ static int srw_bib1_map[] = {
     115, 16,
     116, 16,
     117, 19,
+    117, 20,
     118, 22,
     119, 32,
     119, 31,