X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=doc%2Ftools.xml;h=33de66ecc40d465f336f4caf19a6d8e45f32007b;hp=4d47a1b3bf15f205859e154c9afbfafc9e59c1be;hb=fe4182bf1ca7bebcb3172cde916d4467c2154e7b;hpb=b26c2480fcd2d6c93484372b1b748c5ac54f2c99

diff --git a/doc/tools.xml b/doc/tools.xml
index 4d47a1b..33de66e 100644
--- a/doc/tools.xml
+++ b/doc/tools.xml
@@ -1,9 +1,9 @@
-<!-- $Id: tools.xml,v 1.3 2001-07-20 21:34:36 adam Exp $ -->
+<!-- $Id: tools.xml,v 1.4 2001-08-08 19:33:21 adam Exp $ -->
  <chapter><title>Supporting Tools</title>
-
+  
   <para>
    In support of the service API - primarily the ASN module, which
-   provides the programmatic interface to the Z39.50 APDUs, YAZ contains
+   provides the programmatic interface to the Z39.50 APDUs, &yaz; contains
    a collection of tools that support the development of applications.
   </para>
 
@@ -51,9 +51,8 @@ int p_query_attset (const char *arg);
      to provide a memory source (the structure created is released on
      the next call to <function>odr_reset()</function> on the stream), a
      protocol identifier (one of the constants <token>PROTO_Z3950</token> and
-     <token>PROTO_SR</token>), an attribute set
-     reference, and finally a null-terminated string holding the query
-     string.
+     <token>PROTO_SR</token>), an attribute set reference, and
+     finally a null-terminated string holding the query string.
     </para>
     <para>
      If the parse went well, <function>p_query_rpn()</function> returns a
@@ -74,13 +73,13 @@ int p_query_attset (const char *arg);
     </para>
 
     <screen>
-     Query ::= &lsqb; AttSet &rsqb; QueryStruct.
+     Query ::= &lsqb; '@attrset' AttSet &rsqb; QueryStruct.
 
      AttSet ::= string.
 
-     QueryStruct ::= { Attribute } Simple | Complex.
+     QueryStruct ::= &lsqb; Attribute &rsqb; Simple | Complex.
 
-     Attribute ::= '@attr' AttributeType '=' AttributeValue.
+     Attribute ::= '@attr' &lsqb; AttSet &rsqb; AttributeType '=' AttributeValue.
 
      AttributeType ::= integer.
 
@@ -139,6 +138,8 @@ int p_query_attset (const char *arg);
      @attr 4=1 @attr 1=4 "self portrait"
 
      @prox 0 3 1 2 k 2 dylan zimmerman
+
+     @and @attr 2=4 @attr gils 1=2038 -114 @attr 2=2 @attr gils 1=2039 -109
     </screen>
 
    </sect2>
@@ -686,7 +687,7 @@ typedef struct oident
 
   </sect1>
  </chapter>
-
+ 
  <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml