Fixed conflict (CVS)

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

diff --git a/client/client.c b/client/client.c
index c7e336a..483b838 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -1,10 +1,34 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1996, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: client.c,v $
- * Revision 1.32  1996-03-15 11:05:33  adam
+ * 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
+ * Added display of OIDs in the GRS routine.
+ *
+ * Revision 1.34  1996/05/09  07:26:49  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.33  1996/05/09  07:25:22  quinn
+ * Small
+ *
+ * Revision 1.32  1996/03/15  11:05:33  adam
  * The user can set the preferred query type (prefix, ccl, ..) with the
  * querytype command.
  *
@@ -109,17 +133,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>
@@ -156,7 +174,6 @@ 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";
 
@@ -378,6 +395,21 @@ static void display_grs1(Z_GenericRecord *r, int level)
             printf("%s\n", t->content->u.string);
         else if (t->content->which == Z_ElementData_numeric)
            printf("%d\n", *t->content->u.numeric);
+       else if (t->content->which == Z_ElementData_oid)
+       {
+           int *ip = t->content->u.oid;
+           oident *oent;
+
+           if ((oent = oid_getentbyoid(t->content->u.oid)))
+               printf("OID: %s\n", oent->desc);
+           else
+           {
+               printf("{");
+               while (ip && *ip >= 0)
+                   printf(" %d", *(ip++));
+               printf(" }\n");
+           }
+       }
        else if (t->content->which == Z_ElementData_noDataRequested)
            printf("[No data requested]\n");
        else if (t->content->which == Z_ElementData_elementEmpty)
@@ -508,7 +540,7 @@ static void display_diagrec(Z_DiagRec *p)
         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);
+        printf(" -- '%s'\n", r->addinfo);
     else
         printf("\n");
 }
@@ -754,6 +786,24 @@ 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;
@@ -945,12 +995,24 @@ int cmd_format(char *arg)
         recordsyntax = VAL_DANMARC;
         return 1;
     }
+    else if (!strcmp(arg, "ukmarc"))
+    {
+        printf("Preferred format is UKMARC\n");
+        recordsyntax = VAL_UKMARC;
+        return 1;
+    }
     else if (!strcmp(arg, "grs1"))
     {
         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");
@@ -959,7 +1021,7 @@ int cmd_format(char *arg)
     }
     else
     {
-        printf("Specify one of {sutrs,usmarc,danmarc,grs1}.\n");
+        printf("Specify one of {sutrs,usmarc,danmarc,ukmarc,grs1,summary,explain}.\n");
         return 0;
     }
 }
@@ -984,7 +1046,6 @@ int cmd_elements(char *arg)
 int cmd_attributeset(char *arg)
 {
     char what[100];
-    oid_value v;
 
     if (!arg || !*arg)
     {
@@ -992,12 +1053,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;
 }
 
@@ -1062,7 +1122,7 @@ static void initialize(void)
 #endif
 }
 
-static int client(void)
+static int client(int wait)
 {
     static struct {
         char *cmd;
@@ -1097,9 +1157,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)
@@ -1111,7 +1174,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))
@@ -1139,9 +1205,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
             {
@@ -1208,6 +1279,7 @@ static int client(void)
             }
             while (cs_more(conn));
         }
+       wait = 0;
     }
     return 0;
 }
@@ -1224,5 +1296,5 @@ int main(int argc, char **argv)
        perror(marcdump_file);
        exit(1);
     }
-    return client();
+    return client((argc > 1));
 }