X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fsrwutil.c;h=c38a125f63c65129917a4c2e40c75e3a3211c38b;hp=2c87b83bc3b7396d6be3a294df1a7b0d484f55ac;hb=87c5b79ec9ced76de948e833ef2f8eb561d2f77a;hpb=fe507b6b15788a3a8e58063d9dae52532a5229a5

diff --git a/src/srwutil.c b/src/srwutil.c
index 2c87b83..c38a125 100644
--- a/src/srwutil.c
+++ b/src/srwutil.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: srwutil.c,v 1.56 2007-05-06 20:12:20 adam Exp $
+ * $Id: srwutil.c,v 1.61 2007-08-23 14:28:07 adam Exp $
  */
 /**
  * \file srwutil.c
@@ -28,8 +28,9 @@ void encode_uri_char(char *dst, char ch)
 {
     if (ch == ' ')
         strcpy(dst, "+");
+    /*  mark        = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")" */
     else if ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z') ||
-        (ch >= '0' && ch <= '9'))
+             (ch >= '0' && ch <= '9') || strchr("-_.!~*'(|)", ch))
     {
         dst[0] = ch;
         dst[1] = '\0';
@@ -235,6 +236,20 @@ static int yaz_base64decode(const char *in, char *out)
     return olen;
 }
 
+int yaz_srw_check_content_type(Z_HTTP_Response *hres)
+{
+    const char *content_type = z_HTTP_header_lookup(hres->headers,
+                                                    "Content-Type");
+    if (content_type)
+    {
+        if (!yaz_strcmp_del("text/xml", content_type, "; "))
+            return 1;
+        if (!yaz_strcmp_del("application/xml", content_type, "; "))
+            return 1;
+    }
+    return 0;
+}
+
 /**
  * Look for authentication tokens in HTTP Basic parameters or in x-username/x-password
  * parameters. Added by SH.
@@ -579,9 +594,16 @@ int yaz_sru_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
                     YAZ_SRW_MANDATORY_PARAMETER_NOT_SUPPLIED, "version");
             version = "1.1";
         }
-        if (strcmp(version, "1.1"))
+
+        version = yaz_negotiate_sru_version(version);
+
+        if (!version)
+        {   /* negotiation failed. */
             yaz_add_srw_diagnostic(decode, diag, num_diag,
-                                   YAZ_SRW_UNSUPP_VERSION, "1.1");
+                                   YAZ_SRW_UNSUPP_VERSION, "1.2");
+            version = "1.2";
+        }
+        
         if (!operation)
         {
             if (uri_name)
@@ -799,19 +821,30 @@ Z_SRW_record *yaz_srw_get_record(ODR o)
     return yaz_srw_get_records(o, 1);
 }
 
-Z_SRW_PDU *yaz_srw_get_core_v_1_1(ODR o)
+static Z_SRW_PDU *yaz_srw_get_core_ver(ODR o, const char *version)
 {
     Z_SRW_PDU *p = (Z_SRW_PDU *) odr_malloc(o, sizeof(*p));
-    p->srw_version = odr_strdup(o, "1.1");
+    p->srw_version = odr_strdup(o, version);
     p->username = 0;
     p->password = 0;
     p->extra_args = 0;
     return p;
 }
 
+Z_SRW_PDU *yaz_srw_get_core_v_1_1(ODR o)
+{
+    return yaz_srw_get_core_ver(o, "1.1");
+}
+
 Z_SRW_PDU *yaz_srw_get(ODR o, int which)
 {
-    Z_SRW_PDU *sr = yaz_srw_get_core_v_1_1(o);
+    return yaz_srw_get_pdu(o, which, "1.2");
+}
+
+Z_SRW_PDU *yaz_srw_get_pdu(ODR o, int which, const char *version)
+{
+    Z_SRW_PDU *sr = yaz_srw_get_core_ver(o, version);
+
     sr->which = which;
     switch(which)
     {
@@ -1330,11 +1363,11 @@ const char *yaz_srw_pack_to_str(int pack)
 
 int yaz_srw_str_to_pack(const char *str)
 {
-    if (!strcmp(str, "string"))
+    if (!yaz_matchstr(str, "string"))
         return Z_SRW_recordPacking_string;
-    if (!strcmp(str, "xml"))
+    if (!yaz_matchstr(str, "xml"))
         return Z_SRW_recordPacking_XML;
-    if (!strcmp(str, "url"))
+    if (!yaz_matchstr(str, "url"))
         return Z_SRW_recordPacking_URL;
     return -1;
 }