yaz-client command 'sru' may set both SRU method (SOAP/GET/POST) and

version.

diff --git a/client/client.c b/client/client.c
index c158b00..59c48a0 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *

- * $Id: client.c,v 1.350 2007-08-21 13:19:44 adam Exp $
+ * $Id: client.c,v 1.351 2007-08-24 13:25:14 adam Exp $

  */
 /** \file client.c
  *  \brief yaz-client program
  */
 /** \file client.c
  *  \brief yaz-client program

@@ -90,7 +90,8 @@
 
 static file_history_t file_history = 0;
 
 
 static file_history_t file_history = 0;
 

-static char *sru_method = "soap";
+static char sru_method[10] = "soap";
+static char sru_version[10] = "1.2";

 static char *codeset = 0;               /* character set for output */
 static int hex_dump = 0;
 static char *dump_file_prefix = 0;
 static char *codeset = 0;               /* character set for output */
 static int hex_dump = 0;
 static char *dump_file_prefix = 0;

@@ -1273,15 +1274,15 @@ static int send_srw(Z_SRW_PDU *sr)
 
     gdu = z_get_HTTP_Request_host_path(out, host_port, path);
 
 
     gdu = z_get_HTTP_Request_host_path(out, host_port, path);
 

-    if (!strcmp(sru_method, "get"))
+    if (!yaz_matchstr(sru_method, "get"))

     {
         yaz_sru_get_encode(gdu->u.HTTP_Request, sr, out, charset);
     }
     {
         yaz_sru_get_encode(gdu->u.HTTP_Request, sr, out, charset);
     }

-    else if (!strcmp(sru_method, "post"))
+    else if (!yaz_matchstr(sru_method, "post"))

     {
         yaz_sru_post_encode(gdu->u.HTTP_Request, sr, out, charset);
     }
     {
         yaz_sru_post_encode(gdu->u.HTTP_Request, sr, out, charset);
     }

-    else if (!strcmp(sru_method, "soap"))
+    else if (!yaz_matchstr(sru_method, "soap"))

     {
         yaz_sru_soap_encode(gdu->u.HTTP_Request, sr, out, charset);
     }
     {
         yaz_sru_soap_encode(gdu->u.HTTP_Request, sr, out, charset);
     }

@@ -1344,7 +1345,7 @@ static int send_SRW_scanRequest(const char *arg, int pos, int num)
     Z_SRW_PDU *sr = 0;
     
     /* regular requestse .. */
     Z_SRW_PDU *sr = 0;
     
     /* regular requestse .. */

-    sr = yaz_srw_get(out, Z_SRW_scan_request);
+    sr = yaz_srw_get_pdu(out, Z_SRW_scan_request, sru_version);

 
     switch(queryType)
     {
 
     switch(queryType)
     {

@@ -1379,10 +1380,11 @@ static int send_SRW_searchRequest(const char *arg)
     setno = 1;
 
     /* save this for later .. when fetching individual records */
     setno = 1;
 
     /* save this for later .. when fetching individual records */

-    srw_sr =  yaz_srw_get(srw_sr_odr_out, Z_SRW_searchRetrieve_request);
+    srw_sr =  yaz_srw_get_pdu(srw_sr_odr_out, Z_SRW_searchRetrieve_request,
+                              sru_version);

     
     /* regular request .. */
     
     /* regular request .. */

-    sr = yaz_srw_get(out, Z_SRW_searchRetrieve_request);
+    sr = yaz_srw_get_pdu(out, Z_SRW_searchRetrieve_request, sru_version);

 
     switch(queryType)
     {
 
     switch(queryType)
     {

@@ -2519,19 +2521,26 @@ static int cmd_sru(const char *arg)
     if (!*arg)
     {
         printf("SRU method is: %s\n", sru_method);
     if (!*arg)
     {
         printf("SRU method is: %s\n", sru_method);

+        printf("SRU version is: %s\n", sru_version);

     }
     else
     {
     }
     else
     {

-        if (!yaz_matchstr(arg, "post"))
-            sru_method = "post";
-        else if (!yaz_matchstr(arg, "get"))
-            sru_method = "get";
-        else if (!yaz_matchstr(arg, "soap"))
-            sru_method = "soap";
-        else
+        int r;
+        r = sscanf(arg, "%9s %9s", sru_method, sru_version);
+        if (r >= 1)

         {
         {

-            printf("Unknown SRU method: %s\n", arg);
-            printf("Specify one of POST, GET, SOAP\n");
+            if (!yaz_matchstr(sru_method, "post"))
+                ;
+            else if (!yaz_matchstr(sru_method, "get"))
+                ;
+            else if (!yaz_matchstr(sru_method, "soap"))
+                ;
+            else
+            {
+                strcpy(sru_method, "soap");
+                printf("Unknown SRU method: %s\n", arg);
+                printf("Specify one of POST, GET, SOAP\n");
+            }

         }
     }
     return 0;
         }
     }
     return 0;

@@ -4530,7 +4539,7 @@ static struct {
     {"zversion", cmd_zversion, "", NULL, 0, NULL},
     {"help", cmd_help, "", NULL,0,NULL},
     {"init", cmd_init, "", NULL,0,NULL},
     {"zversion", cmd_zversion, "", NULL, 0, NULL},
     {"help", cmd_help, "", NULL,0,NULL},
     {"init", cmd_init, "", NULL,0,NULL},

-    {"sru", cmd_sru, "", NULL,0,NULL},
+    {"sru", cmd_sru, "<method> <version>", NULL,0,NULL},

     {"exit", cmd_quit, "",NULL,0,NULL},
     {0,0,0,0,0,0}
 };
     {"exit", cmd_quit, "",NULL,0,NULL},
     {0,0,0,0,0,0}
 };

diff --git a/doc/yaz-client-commands.xml b/doc/yaz-client-commands.xml
index 8873d22..64a25f0 100644 (file)
--- a/doc/yaz-client-commands.xml
+++ b/doc/yaz-client-commands.xml
@@ -1,5 +1,5 @@
 <!-- 
 <!-- 

-   $Id: yaz-client-commands.xml,v 1.19 2007-05-30 08:40:26 adam Exp $
+   $Id: yaz-client-commands.xml,v 1.20 2007-08-24 13:25:13 adam Exp $

    Commands for YAZ client.
    Included in both manual and man page for yaz-client.
 -->
    Commands for YAZ client.
    Included in both manual and man page for yaz-client.
 -->

@@ -184,11 +184,14 @@
  </varlistentry>
 
  <varlistentry><term>
  </varlistentry>
 
  <varlistentry><term>

-   <literal>sru</literal> <replaceable>method</replaceable>
+   <literal>sru</literal> <replaceable>method</replaceable> <replaceable>version</replaceable>

   </term>
   <listitem>
   </term>
   <listitem>

-   <para>Selects SRU method. Must be one of <literal>POST</literal>,
-    <literal>GET</literal>, <literal>SOAP</literal> (default).
+   <para>Selects SRU method and version.
+    Must be one of <literal>POST</literal>,
+    <literal>GET</literal>, <literal>SOAP</literal> (default). Version
+    should be either 1.1 or 1.2. Other versions are allowed - for testing
+    purposes (version negotiation with SRU server).

    </para>
   </listitem>
  </varlistentry>
    </para>
   </listitem>
  </varlistentry>