Changed the way yaz-client encodes charset negotiation information

[yaz-moved-to-github.git] / client / client.c

diff --git a/client/client.c b/client/client.c
index 9b050de..82c78ca 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.
  *
- * $Id: client.c,v 1.340 2007-05-30 08:12:16 adam Exp $
+ * $Id: client.c,v 1.342 2007-05-30 21:56:59 adam Exp $
  */
 /** \file client.c
  *  \brief yaz-client program
@@ -63,6 +63,7 @@
 #include <yaz/diagbib1.h>
 #include <yaz/otherinfo.h>
 #include <yaz/charneg.h>
+#include <yaz/query-charset.h>
 
 #include <yaz/pquery.h>
 #include <yaz/sortspec.h>
@@ -133,6 +134,7 @@ static int  negotiationCharsetRecords = 1;
 static int  negotiationCharsetVersion = 3;
 static char *outputCharset = 0;
 static char *marcCharset = 0;
+static char *queryCharset = 0;
 static char* yazLang = 0;
 
 static char last_cmd[32] = "?";
@@ -184,6 +186,7 @@ char **readline_completer(char *text, int start, int end);
 #endif
 static char *command_generator(const char *text, int state);
 int cmd_register_tab(const char* arg);
+int cmd_querycharset(const char *arg);
 
 static void close_session (void);
 
@@ -361,6 +364,21 @@ static void send_initRequest(const char* type_and_host)
                                               negotiationCharsetRecords);
         }
     }
+    else if (ODR_MASK_GET(req->options, Z_Options_negotiationModel))
+    {
+        Z_OtherInformation **p;
+        Z_OtherInformationUnit *p0;
+        
+        yaz_oi_APDU(apdu, &p);
+        
+        if ((p0=yaz_oi_update(p, out, NULL, 0, 0)))
+        {
+            p0->which = Z_OtherInfo_externallyDefinedInfo;
+            p0->information.externallyDefinedInfo =
+                yaz_set_proposal_charneg(out, 0, 0, 0, 0, 0);
+        }
+
+    }
     if (send_apdu(apdu))
         printf("Sent initrequest.\n");
 }
@@ -452,27 +470,30 @@ static int process_initResponse(Z_InitResponse *res)
         Z_CharSetandLanguageNegotiation *p =
                 yaz_get_charneg_record(res->otherInfo);
 
-        if (p) {
-            
+        if (p) 
+        {
             char *charset=NULL, *lang=NULL;
             int selected;
             
             yaz_get_response_charneg(session_mem, p, &charset, &lang,
                                      &selected);
 
-            printf("Accepted character set : %s\n", charset);
-            printf("Accepted code language : %s\n", lang ? lang : "none");
+            printf("Accepted character set : %s\n", charset ? charset:"none");
+            printf("Accepted code language : %s\n", lang ? lang:"none");
             printf("Accepted records in ...: %d\n", selected );
 
-            if (outputCharset && negotiationCharset) {
+            if (outputCharset && charset)
+            {
                 printf("Converting between %s and %s\n",
-                       outputCharset, negotiationCharset);
-                odr_set_charset (out, charset, outputCharset);
-                odr_set_charset (in, outputCharset, charset);
+                       outputCharset, charset);
+                odr_set_charset(out, charset, outputCharset);
+                odr_set_charset(in, outputCharset, charset);
+                cmd_querycharset(charset);
             }
-            else {
-                odr_set_charset (out, 0, 0);
-                odr_set_charset (in, 0, 0);
+            else
+            {
+                odr_set_charset(out, 0, 0);
+                odr_set_charset(in, 0, 0);
             }
         }
     }
@@ -1396,6 +1417,22 @@ static int send_SRW_searchRequest(const char *arg)
 }
 #endif
 
+static void query_charset_convert(Z_RPNQuery *q)
+{
+    if (queryCharset && outputCharset)
+    {
+        yaz_iconv_t cd = yaz_iconv_open(queryCharset, outputCharset);
+        if (!cd)
+        {
+            printf("Conversion from %s to %s unsupported\n",
+                   outputCharset, queryCharset);
+            return;
+        }
+        yaz_query_charset_convert_rpnquery(q, out, cd);
+        yaz_iconv_close(cd);
+    }
+}
+
 static int send_searchRequest(const char *arg)
 {
     Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest);
@@ -1501,6 +1538,7 @@ static int send_searchRequest(const char *arg)
             return 0;
         }
         yaz_pqf_destroy (pqf_parser);
+        query_charset_convert(RPNquery);
         query.u.type_1 = RPNquery;
         break;
     case QueryType_CCL:
@@ -1517,6 +1555,7 @@ static int send_searchRequest(const char *arg)
             printf ("Couldn't convert from CCL to RPN\n");
             return 0;
         }
+        query_charset_convert(RPNquery);
         query.u.type_1 = RPNquery;
         ccl_rpn_delete (rpn);
         break;
@@ -2900,6 +2939,18 @@ int send_scanrequest(const char *set,  const char *query,
         }
         yaz_pqf_destroy (pqf_parser);
     }
+    if (queryCharset && outputCharset)
+    {
+        yaz_iconv_t cd = yaz_iconv_open(queryCharset, outputCharset);
+        if (!cd)
+        {
+            printf("Conversion from %s to %s unsupported\n",
+                   outputCharset, queryCharset);
+            return -1;
+        }
+        yaz_query_charset_convert_apt(req->termListAndStartPoint, out, cd);
+        yaz_iconv_close(cd);
+    }
     if (term && *term)
     {
         if (req->termListAndStartPoint->term &&
@@ -3316,11 +3367,29 @@ int cmd_marccharset(const char *arg)
     }
     xfree (marcCharset);
     marcCharset = 0;
-    if (strcmp(l1, "-"))
+    if (strcmp(l1, "-") && strcmp(l1, "none"))
         marcCharset = xstrdup(l1);
     return 1;
 }
 
+int cmd_querycharset(const char *arg)
+{
+    char l1[30];
+
+    *l1 = 0;
+    if (sscanf(arg, "%29s", l1) < 1)
+    {
+        printf("Query character set is `%s'\n", 
+               queryCharset ? queryCharset: "none");
+        return 1;
+    }
+    xfree (queryCharset);
+    queryCharset = 0;
+    if (strcmp(l1, "-") && strcmp(l1, "none"))
+        queryCharset = xstrdup(l1);
+    return 1;
+}
+
 int cmd_displaycharset(const char *arg)
 {
     char l1[30];
@@ -3359,11 +3428,14 @@ int cmd_negcharset(const char *arg)
     if (sscanf(arg, "%29s %d %d", l1, &negotiationCharsetRecords,
                &negotiationCharsetVersion) < 1)
     {
-        printf("Current negotiation character set is `%s'\n", 
+        printf("Negotiation character set `%s'\n", 
                negotiationCharset ? negotiationCharset: "none");  
-        printf("Records in charset %s\n", negotiationCharsetRecords ? 
-               "yes" : "no");
-        printf("Charneg version %d\n", negotiationCharsetVersion);
+        if (negotiationCharset)
+        {
+            printf("Records in charset %s\n", negotiationCharsetRecords ? 
+                   "yes" : "no");
+            printf("Charneg version %d\n", negotiationCharsetVersion);
+        }
     }
     else
     {
@@ -3380,14 +3452,15 @@ int cmd_negcharset(const char *arg)
 
 int cmd_charset(const char* arg)
 {
-    char l1[30], l2[30], l3[30];
+    char l1[30], l2[30], l3[30], l4[30];
 
-    *l1 = *l2 = *l3 = 0;
-    if (sscanf(arg, "%29s %29s %29s", l1, l2, l3) < 1)
+    *l1 = *l2 = *l3 = *l4 = '\0';
+    if (sscanf(arg, "%29s %29s %29s %29s", l1, l2, l3, l4) < 1)
     {
         cmd_negcharset("");
         cmd_displaycharset("");
         cmd_marccharset("");
+        cmd_querycharset("");
     }
     else
     {
@@ -3396,6 +3469,8 @@ int cmd_charset(const char* arg)
             cmd_displaycharset(l2);
         if (*l3)
             cmd_marccharset(l3);
+        if (*l4)
+            cmd_querycharset(l4);
     }
     return 1;
 }
@@ -3403,7 +3478,7 @@ int cmd_charset(const char* arg)
 int cmd_lang(const char* arg)
 {
     if (*arg == '\0') {
-        printf("Current language is `%s'\n", (yazLang)?yazLang:NULL);
+        printf("Current language is `%s'\n", yazLang ? yazLang : "none");
         return 1;
     }
     xfree (yazLang);
@@ -4384,6 +4459,7 @@ static struct {
     {"negcharset", cmd_negcharset, "<nego_charset>",NULL,0,NULL},
     {"displaycharset", cmd_displaycharset, "<output_charset>",NULL,0,NULL},
     {"marccharset", cmd_marccharset, "<charset_name>",NULL,0,NULL},
+    {"querycharset", cmd_querycharset, "<charset_name>",NULL,0,NULL},
     {"lang", cmd_lang, "<language_code>",NULL,0,NULL},
     {"source", cmd_source_echo, "<filename>",NULL,1,NULL},
     {".", cmd_source_echo, "<filename>",NULL,1,NULL},