X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=66dc48e131f9f82e9173053a7402befe40af3e6e;hp=ee7f97fb3ae1a8fd832385adfbfe78a74bd8ce83;hb=79bf9f1b8b224b6b7323b280fca704591ac17324;hpb=9f1aa1005f6e9db2484ec053bf0fd9b109625755

diff --git a/client/client.c b/client/client.c
index ee7f97f..66dc48e 100644
--- a/client/client.c
+++ b/client/client.c
@@ -1,10 +1,65 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1997, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: client.c,v $
- * Revision 1.36  1996-06-10 08:53:47  quinn
+ * Revision 1.53  1997-09-29 13:18:59  adam
+ * Added function, oid_ent_to_oid, to replace the function
+ * oid_getoidbyent, which is not thread safe.
+ *
+ * Revision 1.52  1997/09/29 07:20:31  adam
+ * Client code uses nmem_init.
+ *
+ * Revision 1.51  1997/09/26 09:41:55  adam
+ * Updated client to handle multiple diagnostics.
+ *
+ * Revision 1.50  1997/09/17 12:10:29  adam
+ * YAZ version 1.4.
+ *
+ * Revision 1.49  1997/09/04 13:45:17  adam
+ * Added UNImarc to list of available syntaxes.
+ *
+ * Revision 1.48  1997/09/01 08:48:44  adam
+ * New windows NT/95 port using MSV5.0. Only a few changes made
+ * to avoid warnings. Sub project created: client.dsp.
+ *
+ * Revision 1.47  1997/07/01 13:49:56  adam
+ * Take care of case when invalid target is specified on command line.
+ *
+ * Revision 1.46  1997/06/23 10:30:18  adam
+ * Added call to ccl_rpn_delete in search. Added ODR stream "out"
+ * as parameter to ccl_rpn_query to release RPN query.
+ *
+ * Revision 1.45  1997/05/14 06:53:29  adam
+ * C++ support.
+ *
+ * Revision 1.44  1997/05/05 11:20:35  adam
+ * Client uses "options" utility and marc dump filename may be specified
+ * as an option (-m <file>).
+ *
+ * Revision 1.43  1996/11/08 11:03:26  adam
+ * Client accepts multiple database names.
+ *
+ * Revision 1.42  1996/10/08 10:44:57  quinn
+ * Resolved conflicts.
+ *
+ * Revision 1.41  1996/10/07  15:29:03  quinn
+ * Work
+ *
+ * Revision 1.40  1996/08/29  14:19:34  quinn
+ * Fixed conflict (CVS)
+ *
+ * Revision 1.39  1996/08/27  10:43:22  quinn
+ * Made select() optional
+ *
+ * Revision 1.38  1996/08/12  14:09:11  adam
+ * Default prefix query attribute set defined by using p_query_attset.
+ *
+ * Revision 1.37  1996/07/06  19:58:29  quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.36  1996/06/10  08:53:47  quinn
  * Added Summary
  *
  * Revision 1.35  1996/06/03  09:45:50  quinn
@@ -121,17 +176,11 @@
  * to illustrate the use of the YAZ service-level API.
  */
 
+#include <yconfig.h>
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef WINDOWS
 #include <time.h>
-#else
-#include <sys/time.h>
-#endif
 #include <assert.h>
-#ifdef _AIX
-#include <sys/select.h>
-#endif
 
 #include <comstack.h>
 #include <tcpip.h>
@@ -142,6 +191,7 @@
 #include <proto.h>
 #include <marcdisp.h>
 #include <diagbib1.h>
+#include <options.h>
 
 #include <pquery.h>
 
@@ -154,7 +204,8 @@
 static ODR out, in, print;              /* encoding and decoding streams */
 static COMSTACK conn = 0;               /* our z-association */
 static Z_IdAuthentication *auth = 0;    /* our current auth definition */
-static char database[512] = "Default";  /* Database name */
+static char *databaseNames[128];
+static int num_databaseNames = 0;
 static int setnumber = 0;               /* current result set number */
 static int smallSetUpperBound = 0;
 static int largeSetLowerBound = 1;
@@ -168,9 +219,7 @@ static ODR_MEM session_mem;             /* memory handle for init-response */
 static Z_InitResponse *session = 0;     /* session parameters */
 static char last_scan[512] = "0";
 static char last_cmd[100] = "?";
-static oid_value attributeset = VAL_BIB1;
 static FILE *marcdump = 0;
-static char marcdump_file[512] = "marc.out";
 
 typedef enum {
     QueryType_Prefix,
@@ -278,39 +327,34 @@ int cmd_open(char *arg)
         fprintf(stderr, "Usage: open (osi|tcp) ':' [tsel '/']host[':'port]\n");
         return 0;
     }
+    if (!strcmp(type, "tcp"))
+    {
+	t = tcpip_type;
+	protocol = PROTO_Z3950;
+    }
+    else
 #ifdef USE_XTIMOSI
     if (!strcmp(type, "osi"))
     {
-        if (!(add = mosi_strtoaddr(addr)))
-        {
-            perror(arg);
-            return 0;
-        }
         t = mosi_type;
         protocol = PROTO_SR;
     }
     else
 #endif
-    if (!strcmp(type, "tcp"))
     {
-        if (!(add = tcpip_strtoaddr(addr)))
-        {
-            perror(arg);
-            return 0;
-        }
-        t = tcpip_type;
-        protocol = PROTO_Z3950;
-    }
-    else
-    {
-        fprintf(stderr, "Bad type: %s\n", type);
-        return 0;
+	fprintf(stderr, "Bad type: %s\n", type);
+	return 0;
     }
     if (!(conn = cs_create(t, 1, protocol)))
     {
         perror("cs_create");
         return 0;
     }
+    if (!(add = cs_straddr(conn, addr)))
+    {
+	perror(arg);
+	return 0;
+    }
     printf("Connecting...");
     fflush(stdout);
     if (cs_connect(conn, add) < 0)
@@ -351,7 +395,7 @@ static void display_variant(Z_Variant *v, int level)
 
     for (i = 0; i < v->num_triples; i++)
     {
-	printf("%*sclass=%d,type=%d", level * 4, "", *v->triples[i]->class,
+	printf("%*sclass=%d,type=%d", level * 4, "", *v->triples[i]->zclass,
 	    *v->triples[i]->type);
 	if (v->triples[i]->which == Z_Triple_internationalString)
 	    printf(",value=%s\n", v->triples[i]->value.internationalString);
@@ -480,8 +524,15 @@ static void display_record(Z_DatabaseRecord *p)
 	    r->which = type->what;
 	}
     }
-    if (r->which == Z_External_octet && p->u.octet_aligned->len)
-        marc_display ((char*)p->u.octet_aligned->buf, stdout);
+    if (ent->value == VAL_SOIF)
+        printf("%.*s", r->u.octet_aligned->len, r->u.octet_aligned->buf);
+    else if (r->which == Z_External_octet && p->u.octet_aligned->len)
+    {
+        const char *marc_buf = (char*)p->u.octet_aligned->buf;
+        marc_display (marc_buf, NULL);
+        if (marcdump)
+            fwrite (marc_buf, strlen (marc_buf), 1, marcdump);
+    }
     else if (ent->value == VAL_SUTRS)
     {
         if (r->which != Z_External_sutrs)
@@ -511,41 +562,42 @@ static void display_record(Z_DatabaseRecord *p)
     }
 }
 
-static void display_diagrec(Z_DiagRec *p)
+
+static void display_diagrecs(Z_DiagRec **pp, int num)
 {
+    int i;
     oident *ent;
-#ifdef Z_95
     Z_DefaultDiagFormat *r;
-#else
-    Z_DiagRec *r = p;
-#endif
 
-    printf("Diagnostic message from database:\n");
-#ifdef Z_95
-    if (p->which != Z_DiagRec_defaultFormat)
+    printf("Diagnostic message(s) from database:\n");
+    for (i = 0; i<num; i++)
     {
-        printf("Diagnostic record not in default format.\n");
-        return;
+	Z_DiagRec *p = pp[i];
+	if (p->which != Z_DiagRec_defaultFormat)
+	{
+	    printf("Diagnostic record not in default format.\n");
+	    return;
+	}
+	else
+	    r = p->u.defaultFormat;
+	if (!(ent = oid_getentbyoid(r->diagnosticSetId)) ||
+	    ent->oclass != CLASS_DIAGSET || ent->value != VAL_BIB1)
+	    printf("Missing or unknown diagset\n");
+	printf("    [%d] %s", *r->condition, diagbib1_str(*r->condition));
+	if (r->addinfo && *r->addinfo)
+	    printf(" -- '%s'\n", r->addinfo);
+	else
+	    printf("\n");
     }
-    else
-        r = p->u.defaultFormat;
-#endif
-    if (!(ent = oid_getentbyoid(r->diagnosticSetId)) ||
-        ent->oclass != CLASS_DIAGSET || ent->value != VAL_BIB1)
-        printf("Missing or unknown diagset\n");
-    printf("    [%d] %s", *r->condition, diagbib1_str(*r->condition));
-    if (r->addinfo && *r->addinfo)
-        printf(" -- '%s'\n", r->addinfo);
-    else
-        printf("\n");
 }
 
+
 static void display_nameplusrecord(Z_NamePlusRecord *p)
 {
     if (p->databaseName)
         printf("[%s]", p->databaseName);
     if (p->which == Z_NamePlusRecord_surrogateDiagnostic)
-        display_diagrec(p->u.surrogateDiagnostic);
+        display_diagrecs(&p->u.surrogateDiagnostic, 1);
     else
         display_record(p->u.databaseRecord);
 }
@@ -555,8 +607,11 @@ static void display_records(Z_Records *p)
     int i;
 
     if (p->which == Z_Records_NSD)
-        display_diagrec(p->u.nonSurrogateDiagnostic);
-    else
+	display_diagrecs (&p->u.nonSurrogateDiagnostic, 1);
+    else if (p->which == Z_Records_multipleNSD)
+	display_diagrecs (p->u.multipleNonSurDiagnostics->diagRecs,
+			  p->u.multipleNonSurDiagnostics->num_diagRecs);
+    else 
     {
         printf("Records: %d\n", p->u.databaseOrSurDiagnostics->num_records);
         for (i = 0; i < p->u.databaseOrSurDiagnostics->num_records; i++)
@@ -568,8 +623,8 @@ static int send_searchRequest(char *arg)
 {
     Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest);
     Z_SearchRequest *req = apdu->u.searchRequest;
-    char *databaseNames = database;
     Z_Query query;
+    int oid[OID_SIZE];
 #if CCL2RPN
     struct ccl_rpn_node *rpn;
     int error, pos;
@@ -615,17 +670,18 @@ static int send_searchRequest(char *arg)
         mediumSetPresentNumber > 0))
     {
         oident prefsyn;
+        int oid[OID_SIZE];
 
         prefsyn.proto = protocol;
         prefsyn.oclass = CLASS_RECSYN;
         prefsyn.value = recordsyntax;
         req->preferredRecordSyntax =
-            odr_oiddup(out, oid_getoidbyent(&prefsyn));
+            odr_oiddup(out, oid_ent_to_oid(&prefsyn, oid));
         req->smallSetElementSetNames =
             req->mediumSetElementSetNames = elementSetNames;
     }
-    req->num_databaseNames = 1;
-    req->databaseNames = &databaseNames;
+    req->num_databaseNames = num_databaseNames;
+    req->databaseNames = databaseNames;
 
     req->query = &query;
 
@@ -650,12 +706,13 @@ static int send_searchRequest(char *arg)
 #if CCL2RPN
     case QueryType_CCL2RPN:
         query.which = Z_Query_type_1;
-        assert((RPNquery = ccl_rpn_query(rpn)));
+        assert((RPNquery = ccl_rpn_query(out, rpn)));
         bib1.proto = protocol;
         bib1.oclass = CLASS_ATTSET;
         bib1.value = VAL_BIB1;
-        RPNquery->attributeSetId = oid_getoidbyent(&bib1);
+        RPNquery->attributeSetId = oid_ent_to_oid(&bib1, oid);
         query.u.type_1 = RPNquery;
+        ccl_rpn_delete (rpn);
         break;
 #endif
     default:
@@ -732,12 +789,30 @@ static int cmd_status(char *arg)
 
 static int cmd_base(char *arg)
 {
+    int i;
+    char *cp;
+
     if (!*arg)
     {
-        printf("Usage: base <database>\n");
+        printf("Usage: base <database> <database> ...\n");
         return 0;
     }
-    strcpy(database, arg);
+    for (i = 0; i<num_databaseNames; i++)
+        xfree (databaseNames[i]);
+    num_databaseNames = 0;
+    while (1)
+    {
+        if (!(cp = strchr(arg, ' ')))
+            cp = arg + strlen(arg);
+        if (cp - arg < 1)
+            break;
+        databaseNames[num_databaseNames] = xmalloc (1 + cp - arg);
+        memcpy (databaseNames[num_databaseNames], arg, cp - arg);
+        databaseNames[num_databaseNames++][cp - arg] = '\0';
+        if (!*cp)
+            break;
+        arg = cp+1;
+    }
     return 1;
 }
 
@@ -765,6 +840,7 @@ static int send_presentRequest(char *arg)
     Z_RecordComposition compo;
     oident prefsyn;
     int nos = 1;
+    int oid[OID_SIZE];
     char *p;
     char setstring[100];
 
@@ -781,12 +857,22 @@ static int send_presentRequest(char *arg)
         sprintf(setstring, "%d", setnumber);
         req->resultSetId = setstring;
     }
+
+
+#if 0
+    if (1)
+    {
+	static Z_Range range;
+	static Z_Range *rangep = &range;
+    req->num_ranges = 1;
+#endif
     req->resultSetStartPoint = &setno;
     req->numberOfRecordsRequested = &nos;
     prefsyn.proto = protocol;
     prefsyn.oclass = CLASS_RECSYN;
     prefsyn.value = recordsyntax;
-    req->preferredRecordSyntax = oid_getoidbyent(&prefsyn);
+    req->preferredRecordSyntax = oid_ent_to_oid(&prefsyn, oid);
+
     if (elementSetNames)
     {
         req->recordComposition = &compo;
@@ -841,6 +927,7 @@ int cmd_quit(char *arg)
 {
     printf("See you later, alligator.\n");
     exit(0);
+    return 0;
 }
 
 int cmd_cancel(char *arg)
@@ -848,7 +935,7 @@ int cmd_cancel(char *arg)
     Z_APDU *apdu = zget_APDU(out, Z_APDU_triggerResourceControlRequest);
     Z_TriggerResourceControlRequest *req =
         apdu->u.triggerResourceControlRequest;
-    bool_t false = 0;
+    bool_t rfalse = 0;
     
     if (!session)
     {
@@ -861,7 +948,7 @@ int cmd_cancel(char *arg)
         return 0;
     }
     *req->requestedAction = Z_TriggerResourceCtrl_cancel;
-    req->resultSetWanted = &false;
+    req->resultSetWanted = &rfalse;
 
     send_apdu(apdu);
     printf("Sent cancel request\n");
@@ -872,10 +959,9 @@ int send_scanrequest(char *string, int pp, int num)
 {
     Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest);
     Z_ScanRequest *req = apdu->u.scanRequest;
-    char *db = database;
 
-    req->num_databaseNames = 1;
-    req->databaseNames = &db;
+    req->num_databaseNames = num_databaseNames;
+    req->databaseNames = databaseNames;
     req->termListAndStartPoint = p_query_scan(out, protocol,
                                               &req->attributeSet, string);
     req->numberOfTermsRequested = &num;
@@ -918,10 +1004,11 @@ void process_scanResponse(Z_ScanResponse *res)
                 display_term(ent->entries[i]->u.termInfo);
             }
             else
-                display_diagrec(ent->entries[i]->u.surrogateDiagnostic);
+                display_diagrecs(&ent->entries[i]->u.surrogateDiagnostic, 1);
     }
     else
-        display_diagrec(res->entries->u.nonSurrogateDiagnostics->diagRecs[0]);
+        display_diagrecs(&res->entries->
+			 u.nonSurrogateDiagnostics->diagRecs[0], 1);
 }
 
 int cmd_scan(char *arg)
@@ -954,47 +1041,13 @@ int cmd_format(char *arg)
         printf("Usage: format <recordsyntax>\n");
         return 0;
     }
-    if (!strcmp(arg, "sutrs"))
-    {
-        printf("Preferred format is SUTRS.\n");
-        recordsyntax = VAL_SUTRS;
-        return 1;
-    }
-    else if (!strcmp(arg, "usmarc"))
-    {
-        printf("Preferred format is USMARC\n");
-        recordsyntax = VAL_USMARC;
-        return 1;
-    }
-    else if (!strcmp(arg, "danmarc"))
-    {
-        printf("Preferred format is DANMARC\n");
-        recordsyntax = VAL_DANMARC;
-        return 1;
-    }
-    else if (!strcmp(arg, "grs1"))
+    recordsyntax = oid_getvalbyname (arg);
+    if (recordsyntax == VAL_NONE)
     {
-        printf("Preferred format is GRS1\n");
-        recordsyntax = VAL_GRS1;
-        return 1;
-    }
-    else if (!strcmp(arg, "summary"))
-    {
-        printf("Preferred format is Summary\n");
-        recordsyntax = VAL_SUMMARY;
-        return 1;
-    }
-    else if (!strcmp(arg, "explain"))
-    {
-        printf("Preferred format is Explain\n");
-        recordsyntax = VAL_EXPLAIN;
-        return 1;
-    }
-    else
-    {
-        printf("Specify one of {sutrs,usmarc,danmarc,grs1}.\n");
+        printf ("unknown record syntax\n");
         return 0;
     }
+    return 1;
 }
 
 int cmd_elements(char *arg)
@@ -1017,7 +1070,6 @@ int cmd_elements(char *arg)
 int cmd_attributeset(char *arg)
 {
     char what[100];
-    oid_value v;
 
     if (!arg || !*arg)
     {
@@ -1025,12 +1077,11 @@ int cmd_attributeset(char *arg)
 	return 0;
     }
     sscanf(arg, "%s", what);
-    if ((v = oid_getvalbyname(what)) == VAL_NONE)
+    if (p_query_attset (what))
     {
 	printf("Unknown attribute set name\n");
 	return 0;
     }
-    attributeset = v;
     return 1;
 }
 
@@ -1074,7 +1125,7 @@ static void initialize(void)
 #if CCL2RPN
     FILE *inf;
 #endif
-
+    nmem_init();
     if (!(out = odr_createmem(ODR_ENCODE)) ||
         !(in = odr_createmem(ODR_DECODE)) ||
         !(print = odr_createmem(ODR_PRINT)))
@@ -1095,7 +1146,7 @@ static void initialize(void)
 #endif
 }
 
-static int client(void)
+static int client(int wait)
 {
     static struct {
         char *cmd;
@@ -1130,9 +1181,12 @@ static int client(void)
     while (1)
     {
         int res;
+#ifdef USE_SELECT
         fd_set input;
+#endif
         char line[1024], word[1024], arg[1024];
 
+#ifdef USE_SELECT
         FD_ZERO(&input);
         FD_SET(0, &input);
         if (conn)
@@ -1144,7 +1198,10 @@ static int client(void)
         }
         if (!res)
             continue;
-        if (FD_ISSET(0, &input))
+        if (!wait && FD_ISSET(0, &input))
+#else
+	if (!wait)
+#endif
         {
             /* quick & dirty way to get a command line. */
             if (!gets(line))
@@ -1172,9 +1229,14 @@ static int client(void)
                 res = 1;
             }
             if (res < 2)
+	    {
                 printf(C_PROMPT);
+		continue;
+	    }
         }
+#ifdef USE_SELECT
         if (conn && FD_ISSET(cs_fileno(conn), &input))
+#endif
         {
             do
             {
@@ -1241,21 +1303,43 @@ static int client(void)
             }
             while (cs_more(conn));
         }
+	wait = 0;
     }
     return 0;
 }
 
 int main(int argc, char **argv)
 {
+    char *prog = *argv;
+    char *arg;
+    int ret;
+    int opened = 0;
+
     initialize();
-    if (argc > 1)
-        cmd_open(argv[1]);
-    else
-        printf(C_PROMPT);
-    if (*marcdump_file && !(marcdump = fopen(marcdump_file, "a")))
+    cmd_base("Default");
+
+    while ((ret = options("m:", argv, argc, &arg)) != -2)
     {
-	perror(marcdump_file);
-	exit(1);
+        switch (ret)
+        {
+        case 0:
+            if (cmd_open (arg) == 2)
+                opened = 1;
+            break;
+        case 'm':
+            if (!(marcdump = fopen (arg, "a")))
+            {
+                perror (arg);
+                exit (1);
+            }
+            break;
+        default:
+            fprintf (stderr, "Usage: %s [-m <marclog>] [<server-addr>]\n",
+                     prog);
+            exit (1);
+        }
     }
-    return client();
+    if (!opened)
+        printf (C_PROMPT);
+    return client (opened);
 }