Default prefix query attribute set defined by using p_query_attset.

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

diff --git a/client/client.c b/client/client.c
index 1632254..2df1cda 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -1,10 +1,19 @@
 /*
- * 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.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 +127,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 +168,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";
 
@@ -778,6 +780,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;
@@ -975,6 +995,12 @@ int cmd_format(char *arg)
         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");
@@ -983,7 +1009,7 @@ int cmd_format(char *arg)
     }
     else
     {
-        printf("Specify one of {sutrs,usmarc,danmarc,grs1}.\n");
+        printf("Specify one of {sutrs,usmarc,danmarc,grs1,summary,explain}.\n");
         return 0;
     }
 }
@@ -1008,7 +1034,6 @@ int cmd_elements(char *arg)
 int cmd_attributeset(char *arg)
 {
     char what[100];
-    oid_value v;
 
     if (!arg || !*arg)
     {
@@ -1016,12 +1041,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;
 }