/*
- * 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.36 1996-06-10 08:53:47 quinn
+ * 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
* 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>
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";
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)
{
sprintf(setstring, "%d", setnumber);
req->resultSetId = setstring;
}
+
+
+#if 0
+ if (1)
+ {
+ static Z_Range range;
+ static Z_Range *rangep = ⦥
+ req->num_ranges = 1;
+#endif
+
+
+
+
+
+
+
+
+
req->resultSetStartPoint = &setno;
req->numberOfRecordsRequested = &nos;
prefsyn.proto = protocol;
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, "soif"))
+ {
+ printf("Preferred format is SOIF\n");
+ recordsyntax = VAL_SOIF;
+ return 1;
+ }
else if (!strcmp(arg, "summary"))
{
printf("Preferred format is Summary\n");
}
else
{
- printf("Specify one of {sutrs,usmarc,danmarc,grs1}.\n");
+ printf("Specify one of {sutrs,usmarc,danmarc,ukmarc,grs1,summary,explain}.\n");
return 0;
}
}
int cmd_attributeset(char *arg)
{
char what[100];
- oid_value v;
if (!arg || !*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;
}
#endif
}
-static int client(void)
+static int client(int wait)
{
static struct {
char *cmd;
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)
}
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))
res = 1;
}
if (res < 2)
+ {
printf(C_PROMPT);
+ continue;
+ }
}
+#ifdef USE_SELECT
if (conn && FD_ISSET(cs_fileno(conn), &input))
+#endif
{
do
{
}
while (cs_more(conn));
}
+ wait = 0;
}
return 0;
}
perror(marcdump_file);
exit(1);
}
- return client();
+ return client((argc > 1));
}