Client doesn't set VAL_PROXY otherinfo unless -p is specified.

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

diff --git a/client/client.c b/client/client.c
index 6346942..00819c2 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -3,7 +3,23 @@
  * See the file LICENSE for details.
  *
  * $Log: client.c,v $
- * Revision 1.121  2001-04-22 12:26:17  ja7
+ * Revision 1.126  2001-08-06 20:22:23  adam
+ * Client doesn't set VAL_PROXY otherinfo unless -p is specified.
+ *
+ * Revision 1.125  2001/07/19 19:51:41  adam
+ * Added typecasts to make C++ happy.
+ *
+ * Revision 1.124  2001/07/04 20:13:51  ja7
+ * Added new commend "proxy" for ysing a yaz-proxy to connect to the target
+ * Added new command line option -p for setting the proxy host
+ *
+ * Revision 1.123  2001/06/11 12:54:47  heikki
+ * Displayng diags in EsResponse, even if they should not be there...
+ *
+ * Revision 1.122  2001/05/16 07:27:29  adam
+ * Reference id set for InitRequest.
+ *
+ * Revision 1.121  2001/04/22 12:26:17  ja7
  * if Compiled with Command line history a open command is pushed into
  * the command history if yaz-client is startet with a server on the
  * command line. eg
@@ -415,6 +431,7 @@
 #include <yaz/proto.h>
 #include <yaz/marcdisp.h>
 #include <yaz/diagbib1.h>
+#include <yaz/otherinfo.h>
 
 #include <yaz/pquery.h>
 
@@ -460,8 +477,9 @@ static char last_scan_line[512] = "0";
 static char last_scan_query[512] = "0";
 static char ccl_fields[512] = "default.bib";
 static char* esPackageName = 0;
+static char* yazProxy = 0;
 
-static char last_cmd[100] = "?";
+static char last_cmd[32] = "?";
 static FILE *marcdump = 0;
 static char *refid = NULL;
 
@@ -529,7 +547,7 @@ static Z_ReferenceId *set_refid (ODR out)
 
 /* INIT SERVICE ------------------------------- */
 
-static void send_initRequest()
+static void send_initRequest(const char* type_and_host)
 {
     Z_APDU *apdu = zget_APDU(out, Z_APDU_initRequest);
     Z_InitRequest *req = apdu->u.initRequest;
@@ -552,6 +570,12 @@ static void send_initRequest()
 
     req->idAuthentication = auth;
 
+    req->referenceId = set_refid (out);
+
+    if (yazProxy) 
+        yaz_oi_set_string_oidval(&req->otherInfo, out, VAL_PROXY,
+        1, type_and_host);
+    
     send_apdu(apdu);
     printf("Sent initrequest.\n");
 }
@@ -673,7 +697,15 @@ int cmd_open(char *arg)
     if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1)
         return 0;
 
-    conn = cs_create_host(type_and_host, 1, &add);
+    if(yazProxy) 
+    {
+       conn = cs_create_host(yazProxy, 1, &add);
+    } 
+    else 
+    { 
+       conn = cs_create_host(type_and_host, 1, &add);
+    }
+       
     if (!conn)
     {
        printf ("Couldn't create comstack\n");
@@ -691,7 +723,8 @@ int cmd_open(char *arg)
         return 0;
     }
     printf("Ok.\n");
-    send_initRequest();
+
+    send_initRequest(type_and_host);
     if (*base)
         cmd_base (base);
     return 2;
@@ -1329,6 +1362,11 @@ void process_ESResponse(Z_ExtendedServicesResponse *res)
         display_diagrecs(res->diagnostics, res->num_diagnostics);
         break;
     }
+    if ( (*res->operationStatus != Z_ExtendedServicesResponse_failure) &&
+        (res->num_diagnostics != 0) ) {
+        display_diagrecs(res->diagnostics, res->num_diagnostics);
+    }
+
 }
 
 #if YAZ_MODULE_ill
@@ -2371,6 +2409,17 @@ int cmd_packagename(char* arg) {
     return 1;
 };
 
+int cmd_proxy(char* arg) {
+    xfree (yazProxy);
+    yazProxy = NULL;
+    if (*arg)
+    {
+        yazProxy = (char *) xmalloc (strlen(arg)+1);
+        strcpy (yazProxy, arg);
+    } 
+    return 1;
+};
+
 static void initialize(void)
 {
 #if YAZ_MODULE_ccl
@@ -2433,6 +2482,7 @@ static int client(int wait)
         {"itemorder", cmd_itemorder, "ill|item <itemno>"},
         {"update", cmd_update, "<item>"},
        {"packagename", cmd_packagename, "<packagename>"},
+       {"proxy", cmd_proxy, "('tcp'|'osi')':'[<tsel>'/']<host>[':'<port>]"},
 #ifdef ASN_COMPILED
         /* Server Admin Functions */
         {"adm-reindex", cmd_adm_reindex, "<database-name>"},
@@ -2462,7 +2512,7 @@ static int client(int wait)
 #ifdef USE_SELECT
         fd_set input;
 #endif
-        char line[1024], word[1024], arg[1024];
+        char line[1024], word[32], arg[1024];
         
 #ifdef USE_SELECT
         FD_ZERO(&input);
@@ -2505,7 +2555,7 @@ static int client(int wait)
             gettimeofday (&tv_start, 0);
 #endif
 
-            if ((res = sscanf(line, "%s %[^;]", word, arg)) <= 0)
+            if ((res = sscanf(line, "%31s %1023[^;]", word, arg)) <= 0)
             {
                 strcpy(word, last_cmd);
                 *arg = '\0';
@@ -2640,7 +2690,7 @@ int main(int argc, char **argv)
     int ret;
     int opened = 0;
 
-    while ((ret = options("c:a:m:v:", argv, argc, &arg)) != -2)
+    while ((ret = options("c:a:m:v:p:", argv, argc, &arg)) != -2)
     {
         switch (ret)
         {
@@ -2678,12 +2728,15 @@ int main(int argc, char **argv)
             else
                 apdu_file=fopen(arg, "a");
             break;
+       case 'p':
+           yazProxy=strdup(arg);
+           break;
         case 'v':
             yaz_log_init (yaz_log_mask_str(arg), "", NULL);
             break;
         default:
             fprintf (stderr, "Usage: %s [-m <marclog>] [ -a <apdulog>] "
-                             "[-c cclfields] [<server-addr>]\n",
+                             "[-c cclfields] [-p <proxy-addr>] [<server-addr>]\n",
                      prog);
             exit (1);
         }