# Copyright (C) 1994, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.2 1995-05-22 14:00:02 quinn Exp $
+# $Id: Makefile,v 1.3 1995-05-22 15:30:13 adam Exp $
LIBDIR=../lib
#LIBMOSI=../../xtimosi/src/libmosi.a $(LIBDIR)/librfc.a
SHELL=/bin/sh
-INCLUDE=-I../include -I. -I../../xtimosi/src -I../../alex/include
+INCLUDE=-I../include -I. -I../../xtimosi/src
LIBINCLUDE=-L$(LIBDIR)
#CFLAGS=-Wall -pedantic -g
-DEFS=$(INCLUDE) -DRPN_QUERY
+DEFS=$(INCLUDE) -DRPN_QUERY -DPREFIX_QUERY
#LIB=$(LIBDIR)/libserver.a
LIBS=$(LIBDIR)/libasn.a $(LIBDIR)/libodr.a \
$(LIBDIR)/libcomstack.a ../lib/ccl.a $(LIBMOSI) $(LIBDIR)/libutil.a
all: $(PROG)
-$(PROG): $(LIB) $(PROGO)
+$(PROG): $(LIB) $(PROGO)
$(CC) $(CFLAGS) $(LIBINCLUDE) -o $(PROG) $(PROGO) $(LIBS)
alll:
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: client.c,v $
- * Revision 1.3 1995-05-22 15:06:53 quinn
+ * Revision 1.4 1995-05-22 15:30:13 adam
+ * Client uses prefix query notation.
+ *
+ * Revision 1.3 1995/05/22 15:06:53 quinn
* *** empty log message ***
*
* Revision 1.2 1995/05/22 14:56:40 quinn
#include <oid.h>
#include <marcdisp.h>
+
+#ifdef RPN_QUERY
+#ifdef PREFIX_QUERY
+#include <pquery.h>
+#else
#include <yaz-ccl.h>
+#endif
+#endif
+
#include "../version.h"
#define C_PROMPT "Z> "
static int mediumSetPresentNumber = 0;
static int setno = 1; /* current set offset */
static int protocol = PROTO_Z3950; /* current app protocol */
+#ifdef RPN_QUERY
+#ifndef PREFIX_QUERY
static CCL_bibset bibset; /* CCL bibset handle */
+#endif
+#endif
static void send_apdu(Z_APDU *a)
{
Z_SearchRequest *req = apdu->u.searchRequest;
char *databaseNames = database;
Z_Query query;
+#ifdef RPN_QUERY
+#ifndef PREFIX_QUERY
+ struct ccl_rpn_node *rpn;
int error, pos;
+#endif
+#endif
char setstring[100];
+#ifdef RPN_QUERY
Z_RPNQuery *RPNquery;
oident bib1;
- struct ccl_rpn_node *rpn;
-#ifndef RPN_QUERY
+#else
Odr_oct ccl_query;
#endif
#ifdef RPN_QUERY
+#ifndef PREFIX_QUERY
rpn = ccl_find_str(bibset, arg, &error, &pos);
if (error)
{
return 0;
}
#endif
+#endif
if (!strcmp(arg, "@big")) /* strictly for troublemaking */
{
#ifdef RPN_QUERY
query.which = Z_Query_type_1;
+
+#ifndef PREFIX_QUERY
assert((RPNquery = ccl_rpn_query(rpn)));
+#else
+ RPNquery = p_query_rpn (out, arg);
+ if (!RPNquery)
+ {
+ printf("Prefix query error\n");
+ return 0;
+ }
+#endif
bib1.proto = protocol;
bib1.class = CLASS_ATTSET;
bib1.value = VAL_BIB1;
}
setvbuf(stdout, 0, _IONBF, 0);
+#ifdef RPN_QUERY
+#ifndef PREFIX_QUERY
bibset = ccl_qual_mk ();
inf = fopen ("default.bib", "r");
if (inf)
ccl_qual_file (bibset, inf);
fclose (inf);
}
+#endif
+#endif
}
static int client(void)