/*
- * 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.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
+ * 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.
*
* 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>
#include <proto.h>
#include <marcdisp.h>
#include <diagbib1.h>
+#include <options.h>
#include <pquery.h>
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;
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,
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);
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)
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, stdout);
+ if (marcdump)
+ fwrite (marc_buf, strlen (marc_buf), 1, marcdump);
+ }
else if (ent->value == VAL_SUTRS)
{
if (r->which != Z_External_sutrs)
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");
}
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest);
Z_SearchRequest *req = apdu->u.searchRequest;
- char *databaseNames = database;
Z_Query query;
#if CCL2RPN
struct ccl_rpn_node *rpn;
req->smallSetElementSetNames =
req->mediumSetElementSetNames = elementSetNames;
}
- req->num_databaseNames = 1;
- req->databaseNames = &databaseNames;
+ req->num_databaseNames = num_databaseNames;
+ req->databaseNames = databaseNames;
req->query = &query;
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;
}
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;
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)
{
return 0;
}
*req->requestedAction = Z_TriggerResourceCtrl_cancel;
- req->resultSetWanted = &false;
+ req->resultSetWanted = &rfalse;
send_apdu(apdu);
printf("Sent cancel request\n");
{
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 = #
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");
+ recordsyntax = VAL_SUMMARY;
+ return 1;
+ }
else if (!strcmp(arg, "explain"))
{
printf("Preferred format is Explain\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;
}
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:
+ cmd_open (arg);
+ 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);
}
projects / yaz-moved-to-github.git / blobdiff