X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=943fd7bc99335e62009fb882beaf58b944dd2a82;hp=1632254356bd31015ac24788751cb44e25447a1d;hb=abda0ffc1ac8fca34535f39c6581ed16e70e15f9;hpb=97e81740fd91d912d75ff85fefc61b1d19cbc611

diff --git a/client/client.c b/client/client.c
index 1632254..943fd7b 100644
--- a/client/client.c
+++ b/client/client.c
@@ -1,10 +1,28 @@
 /*
- * 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.35  1996-06-03 09:45:50  quinn
+ * 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
  * Added display of OIDs in the GRS routine.
  *
  * Revision 1.34  1996/05/09  07:26:49  quinn
@@ -118,17 +136,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>
@@ -165,7 +177,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";
 
@@ -477,7 +488,9 @@ static void display_record(Z_DatabaseRecord *p)
 	    r->which = type->what;
 	}
     }
-    if (r->which == Z_External_octet && p->u.octet_aligned->len)
+    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)
         marc_display ((char*)p->u.octet_aligned->buf, stdout);
     else if (ent->value == VAL_SUTRS)
     {
@@ -778,6 +791,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;
@@ -969,12 +1000,36 @@ int cmd_format(char *arg)
         recordsyntax = VAL_DANMARC;
         return 1;
     }
+<<<<<<< client.c
     else if (!strcmp(arg, "grs1"))
     {
         printf("Preferred format is GRS1\n");
         recordsyntax = VAL_GRS1;
         return 1;
     }
+    else if (!strcmp(arg, "soif"))
+||||||| 1.40
+    else if (!strcmp(arg, "grs1"))
+=======
+    else if (!strcmp(arg, "ukmarc"))
+    {
+        printf("Preferred format is UKMARC\n");
+        recordsyntax = VAL_UKMARC;
+        return 1;
+    }
+    else if (!strcmp(arg, "grs1"))
+>>>>>>> /tmp/T4a00171
+    {
+        printf("Preferred format is SOIF\n");
+        recordsyntax = VAL_SOIF;
+        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");
@@ -983,7 +1038,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;
     }
 }
@@ -1008,7 +1063,6 @@ int cmd_elements(char *arg)
 int cmd_attributeset(char *arg)
 {
     char what[100];
-    oid_value v;
 
     if (!arg || !*arg)
     {
@@ -1016,12 +1070,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;
 }
 
@@ -1086,7 +1139,7 @@ static void initialize(void)
 #endif
 }
 
-static int client(void)
+static int client(int wait)
 {
     static struct {
         char *cmd;
@@ -1121,9 +1174,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)
@@ -1135,7 +1191,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))
@@ -1163,9 +1222,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
             {
@@ -1232,6 +1296,7 @@ static int client(void)
             }
             while (cs_more(conn));
         }
+	wait = 0;
     }
     return 0;
 }
@@ -1248,5 +1313,5 @@ int main(int argc, char **argv)
 	perror(marcdump_file);
 	exit(1);
     }
-    return client();
+    return client((argc > 1));
 }