*** empty log message ***

diff --git a/README b/README
index 3149ec5..7dfc5ba 100644 (file)
--- a/README
+++ b/README
@@ -33,6 +33,24 @@ client osi:0103/find2.denet.dk:4500
 
 Use '?' to get a list of the available commands.
 
 
 Use '?' to get a list of the available commands.
 

+The current query language is a bit awkward, but functional:
+
+query::= complex | simple | attr query.
+complex ::= operator query query.
+operator ::= '@and' | '@or' | '@not'.
+simple ::= term | set.
+term ::= <word> | '"' <term> .. '"'.
+set ::= '@set' <setname>.
+attr ::= '@attr' <number> '=' <number>.
+
+Eg.:
+
+Andersen
+
+"Hans Andersen"
+
+@and @attr 1=1 andersen @attr 1=4 @attr 4=2 duckling
+

 The directories:
 
 doc     - Documentation.
 The directories:
 
 doc     - Documentation.

@@ -51,7 +69,7 @@ asn     - This module implements the Z39.50/SR protocol. The best way
        which defines structure and type definitions for each of the
        types introduced in the protocol specification.
 
        which defines structure and type definitions for each of the
        types introduced in the protocol specification.
 

-yazlib  - This module implements the transport transparency
+comstack- This module implements the transport transparency

        stack (COMSTACK). The comstack implements a generic interface
        for exchanging BER-encoded records over a network. It supports
        the 'American' mode of exchanging the records straight over
        stack (COMSTACK). The comstack implements a generic interface
        for exchanging BER-encoded records over a network. It supports
        the 'American' mode of exchanging the records straight over

diff --git a/client/client.c b/client/client.c
index 1cd8151..70455bb 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: client.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: client.c,v $

- * Revision 1.12  1995-06-15 07:44:57  quinn
+ * Revision 1.13  1995-06-16 10:29:11  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.12  1995/06/15  07:44:57  quinn

  * Moving to v3.
  *
  * Revision 1.11  1995/06/14  15:26:40  quinn
  * Moving to v3.
  *
  * Revision 1.11  1995/06/14  15:26:40  quinn

@@ -63,7 +66,6 @@
 #endif
 
 #include <proto.h>
 #endif
 
 #include <proto.h>

-

 #include <marcdisp.h>
 
 #ifdef RPN_QUERY
 #include <marcdisp.h>
 
 #ifdef RPN_QUERY

@@ -271,18 +273,9 @@ void display_record(Z_DatabaseRecord *p)
            odr_reset(print);
        }
     }
            odr_reset(print);
        }
     }

-#if 1

     if (r->which == ODR_EXTERNAL_octet && p->u.octet_aligned->len)
     {
     if (r->which == ODR_EXTERNAL_octet && p->u.octet_aligned->len)
     {

-#if 1

        marc_display ((char*)p->u.octet_aligned->buf, stdout);
        marc_display ((char*)p->u.octet_aligned->buf, stdout);

-#else
-       FILE *ofi = fopen("dump", "a");
-       assert(ofi);
-       fwrite(p->u.octet_aligned->buf, 1, p->u.octet_aligned->len, ofi);
-       fclose(ofi);
-       printf("dumped record\n");
-#endif

     }
     else
     {
     }
     else
     {

@@ -293,7 +286,6 @@ void display_record(Z_DatabaseRecord *p)
            odr_reset(print);
        }
     }
            odr_reset(print);
        }
     }

-#endif

 }
 
 static void display_diagrec(Z_DiagRec *p)
 }
 
 static void display_diagrec(Z_DiagRec *p)

diff --git a/rfc1006/Makefile b/rfc1006/Makefile
index 038f698..53da691 100644 (file)
--- a/rfc1006/Makefile
+++ b/rfc1006/Makefile
@@ -1,14 +1,14 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss

-# $Id: Makefile,v 1.6 1995-06-15 07:45:09 quinn Exp $
+# $Id: Makefile,v 1.7 1995-06-16 10:31:18 quinn Exp $

 
 SHELL=/bin/sh
 INCLUDE=-I../include -I. -I../../xtimosi/src
 LIBDIR=../lib
 LIBINCLUDE=-L$(LIBDIR)
 CFLAGS= -g -Wall -pedantic -ansi
 
 SHELL=/bin/sh
 INCLUDE=-I../include -I. -I../../xtimosi/src
 LIBDIR=../lib
 LIBINCLUDE=-L$(LIBDIR)
 CFLAGS= -g -Wall -pedantic -ansi

-DEFS=$(INCLUDE) -DTRACE_TRANSPORT
+DEFS=$(INCLUDE) # -DTRACE_TRANSPORT

 LIB=$(LIBDIR)/librfc.a
 LIBS=-lodr
 PO = rfct.o makensap.o
 LIB=$(LIBDIR)/librfc.a
 LIBS=-lodr
 PO = rfct.o makensap.o