Doc: strip-trailing-whitespace

diff --git a/doc/asn.xml b/doc/asn.xml
index c787d4f..78ee814 100644 (file)
--- a/doc/asn.xml
+++ b/doc/asn.xml
@@ -15,12 +15,12 @@
     The &asn; module is located in sub directory <filename>z39.50</filename>.
     There you'll find C files that implements encoders and decoders for the
     Z39.50 types. You'll also find the protocol definitions:
     The &asn; module is located in sub directory <filename>z39.50</filename>.
     There you'll find C files that implements encoders and decoders for the
     Z39.50 types. You'll also find the protocol definitions:

-    <filename>z3950v3.asn</filename>, <filename>esupdate.asn</filename>, 
+    <filename>z3950v3.asn</filename>, <filename>esupdate.asn</filename>,

     and others.
    </para>
   </sect1>
   <sect1 id="asn.preparing"><title>Preparing PDUs</title>
     and others.
    </para>
   </sect1>
   <sect1 id="asn.preparing"><title>Preparing PDUs</title>

-   
+

    <para>
     A structure representing a complex ASN.1 type doesn't in itself contain the
     members of that type. Instead, the structure contains
    <para>
     A structure representing a complex ASN.1 type doesn't in itself contain the
     members of that type. Instead, the structure contains

@@ -38,7 +38,7 @@
     taste, there are at least three different approaches that you may take
     when you allocate the structures.
    </para>
     taste, there are at least three different approaches that you may take
     when you allocate the structures.
    </para>

-   
+

    <para>
     You can use static or automatic local variables in the function that
     prepares the PDU. This is a simple approach, and it provides the most
    <para>
     You can use static or automatic local variables in the function that
     prepares the PDU. This is a simple approach, and it provides the most

@@ -73,7 +73,7 @@
     some of its elements, while you leave other elements pointing to global
     or per-session default variables.
    </para>
     some of its elements, while you leave other elements pointing to global
     or per-session default variables.
    </para>

-   
+

    <para>
     The &asn; module provides an important aid in creating new PDUs. For
     each of the PDU types (say, <function>Z_InitRequest</function>), a
    <para>
     The &asn; module provides an important aid in creating new PDUs. For
     each of the PDU types (say, <function>Z_InitRequest</function>), a

@@ -101,11 +101,11 @@
    <synopsis>
     Z_&lt;type> *zget_&lt;type>(ODR o);
    </synopsis>
    <synopsis>
     Z_&lt;type> *zget_&lt;type>(ODR o);
    </synopsis>

-   
+

    <para>
     eg.:
    </para>
    <para>
     eg.:
    </para>

-   
+

    <synopsis>
     Z_InitRequest *zget_InitRequest(ODR o);
    </synopsis>
    <synopsis>
     Z_InitRequest *zget_InitRequest(ODR o);
    </synopsis>

@@ -119,21 +119,21 @@
     <function>zget_APDU()</function> is provided, which allocates
     a top-level Z-APDU of the type requested:
    </para>
     <function>zget_APDU()</function> is provided, which allocates
     a top-level Z-APDU of the type requested:
    </para>

-   
+

    <synopsis>
     Z_APDU *zget_APDU(ODR o, int which);
    </synopsis>
    <synopsis>
     Z_APDU *zget_APDU(ODR o, int which);
    </synopsis>

-   
+

    <para>
     The <varname>which</varname> parameter is (of course) the discriminator
     belonging to the <varname>Z_APDU</varname> <literal>CHOICE</literal> type.
     All of the interface described here is provided by the &asn; module, and
     you access it through the <filename>proto.h</filename> header file.
    <para>
     The <varname>which</varname> parameter is (of course) the discriminator
     belonging to the <varname>Z_APDU</varname> <literal>CHOICE</literal> type.
     All of the interface described here is provided by the &asn; module, and
     you access it through the <filename>proto.h</filename> header file.

-    
+

    </para>
   </sect1>
   <sect1 id="asn.external"><title>EXTERNAL Data</title>
    </para>
   </sect1>
   <sect1 id="asn.external"><title>EXTERNAL Data</title>

-   
+

    <para>
     In order to achieve extensibility and adaptability to different
     application domains, the new version of the protocol defines many
    <para>
     In order to achieve extensibility and adaptability to different
     application domains, the new version of the protocol defines many

@@ -143,7 +143,7 @@
     specialized version of the EXTERNAL construct, called
     <literal>Z_External</literal>.It is defined thus:
    </para>
     specialized version of the EXTERNAL construct, called
     <literal>Z_External</literal>.It is defined thus:
    </para>

-   
+

    <screen>
 typedef struct Z_External
 {
    <screen>
 typedef struct Z_External
 {

@@ -184,7 +184,7 @@ typedef struct Z_External
     } u;
 } Z_External;
    </screen>
     } u;
 } Z_External;
    </screen>

-   
+

    <para>
     When decoding, the &asn; module will attempt to determine which
     syntax describes the data by looking at the reference fields
    <para>
     When decoding, the &asn; module will attempt to determine which
     syntax describes the data by looking at the reference fields

@@ -198,7 +198,7 @@ typedef struct Z_External
     For non-ASN.1 data such as MARC records, use the
     <literal>octet_aligned</literal> arm of the union.
    </para>
     For non-ASN.1 data such as MARC records, use the
     <literal>octet_aligned</literal> arm of the union.
    </para>

-   
+

    <para>
     Some servers return ASN.1 structured data values (eg. database
     records) as BER-encoded records placed in the
    <para>
     Some servers return ASN.1 structured data values (eg. database
     records) as BER-encoded records placed in the

@@ -207,7 +207,7 @@ typedef struct Z_External
     these records. To help you decode the records in the application, the
     function
    </para>
     these records. To help you decode the records in the application, the
     function
    </para>

-   
+

    <screen>
    Z_ext_typeent *z_ext_gettypebyref(const oid *oid);
    </screen>
    <screen>
    Z_ext_typeent *z_ext_gettypebyref(const oid *oid);
    </screen>

@@ -219,7 +219,7 @@ typedef struct Z_External
     <literal>Z_ext_typeent</literal>
     is defined as:
    </para>
     <literal>Z_ext_typeent</literal>
     is defined as:
    </para>

-  
+

    <screen>
 typedef struct Z_ext_typeent
 {
    <screen>
 typedef struct Z_ext_typeent
 {

@@ -228,7 +228,7 @@ typedef struct Z_ext_typeent
     Odr_fun fun;       /* decoder function */
 } Z_ext_typeent;
    </screen>
     Odr_fun fun;       /* decoder function */
 } Z_ext_typeent;
    </screen>

-   
+

    <para>
     The <literal>what</literal> member contains the
     <literal>Z_External</literal> union discriminator value for the
    <para>
     The <literal>what</literal> member contains the
     <literal>Z_External</literal> union discriminator value for the

@@ -239,7 +239,7 @@ typedef struct Z_ext_typeent
     record syntax, the value of <literal>fun</literal> would be
     <literal>z_SUTRS</literal> (a function pointer).
    </para>
     record syntax, the value of <literal>fun</literal> would be
     <literal>z_SUTRS</literal> (a function pointer).
    </para>

-   
+

    <para>
     If you receive an EXTERNAL which contains an octet-string value that
     you suspect of being an ASN.1-structured data value, you can use
    <para>
     If you receive an EXTERNAL which contains an octet-string value that
     you suspect of being an ASN.1-structured data value, you can use

@@ -249,7 +249,7 @@ typedef struct Z_ext_typeent
     function to decode the BER string (see <xref linkend="odr.use"/>
     ).
    </para>
     function to decode the BER string (see <xref linkend="odr.use"/>
     ).
    </para>

-   
+

    <para>
     If you want to <emphasis>send</emphasis> EXTERNALs containing
     ASN.1-structured values in the occtet-aligned branch of the CHOICE, this
    <para>
     If you want to <emphasis>send</emphasis> EXTERNALs containing
     ASN.1-structured values in the occtet-aligned branch of the CHOICE, this

@@ -266,7 +266,7 @@ typedef struct Z_ext_typeent
     is necessary to tell the different, structured types apart
     on decoding.
    </para>
     is necessary to tell the different, structured types apart
     on decoding.
    </para>

-   
+

    <note>
     <para>
      Eventually, the EXTERNAL processing will most likely
    <note>
     <para>
      Eventually, the EXTERNAL processing will most likely

@@ -276,15 +276,15 @@ typedef struct Z_ext_typeent
      various modules.
     </para>
    </note>
      various modules.
     </para>
    </note>

-  
+

   </sect1>
   <sect1 id="asn.pdu"><title>PDU Contents Table</title>
   </sect1>
   <sect1 id="asn.pdu"><title>PDU Contents Table</title>

-   
+

   <para>
     We include, for reference, a listing of the fields of each top-level
     PDU, as well as their default settings.
    </para>
   <para>
     We include, for reference, a listing of the fields of each top-level
     PDU, as well as their default settings.
    </para>

-   
+

    <table frame="top" id="asn.default.initialize.request">
     <title>Default settings for PDU Initialize Request</title>
     <tgroup cols="3">
    <table frame="top" id="asn.default.initialize.request">
     <title>Default settings for PDU Initialize Request</title>
     <tgroup cols="3">

@@ -465,7 +465,7 @@ typedef struct Z_ext_typeent
       </row>
      </thead>
      <tbody>
       </row>
      </thead>
      <tbody>

-      
+

       <row><entry>
        referenceId</entry><entry>Z_ReferenceId</entry><entry>NULL
        </entry></row>
       <row><entry>
        referenceId</entry><entry>Z_ReferenceId</entry><entry>NULL
        </entry></row>

@@ -554,7 +554,7 @@ typedef struct Z_ext_typeent
      </tbody>
     </tgroup>
    </table>
      </tbody>
     </tgroup>
    </table>

-   
+

    <table frame="top" id="asn.default.present.response">
     <title>Default settings for PDU Present Response</title>
     <tgroup cols="3">
    <table frame="top" id="asn.default.present.response">
     <title>Default settings for PDU Present Response</title>
     <tgroup cols="3">

@@ -590,7 +590,7 @@ typedef struct Z_ext_typeent
      </tbody>
     </tgroup>
    </table>
      </tbody>
     </tgroup>
    </table>

-   
+

    <table frame="top" id="asn.default.delete.result.set.request">
     <title>Default settings for Delete Result Set Request
     </title>
    <table frame="top" id="asn.default.delete.result.set.request">
     <title>Default settings for Delete Result Set Request
     </title>

@@ -732,7 +732,7 @@ typedef struct Z_ext_typeent
       </row>
      </thead>
      <tbody>
       </row>
      </thead>
      <tbody>

-      
+

       <row><entry>
        referenceId</entry><entry>Z_ReferenceId</entry><entry>NULL
        </entry></row>
       <row><entry>
        referenceId</entry><entry>Z_ReferenceId</entry><entry>NULL
        </entry></row>

@@ -775,7 +775,7 @@ typedef struct Z_ext_typeent
       </row>
      </thead>
      <tbody>
       </row>
      </thead>
      <tbody>

-      
+

       <row><entry>
        referenceId</entry><entry>Z_ReferenceId</entry><entry>NULL
        </entry></row>
       <row><entry>
        referenceId</entry><entry>Z_ReferenceId</entry><entry>NULL
        </entry></row>

@@ -792,7 +792,7 @@ typedef struct Z_ext_typeent
       <row><entry>
        otherInfo</entry><entry>Z_OtherInformation</entry><entry>NULL
        </entry></row>
       <row><entry>
        otherInfo</entry><entry>Z_OtherInformation</entry><entry>NULL
        </entry></row>

-      
+

      </tbody>
     </tgroup>
    </table>
      </tbody>
     </tgroup>
    </table>

@@ -811,7 +811,7 @@ typedef struct Z_ext_typeent
       </row>
      </thead>
      <tbody>
       </row>
      </thead>
      <tbody>

-      
+

       <row><entry>
        referenceId</entry><entry>Z_ReferenceId</entry><entry>NULL
        </entry></row>
       <row><entry>
        referenceId</entry><entry>Z_ReferenceId</entry><entry>NULL
        </entry></row>

@@ -851,7 +851,7 @@ typedef struct Z_ext_typeent
       </row>
      </thead>
      <tbody>
       </row>
      </thead>
      <tbody>

-      
+

       <row><entry>
        referenceId</entry><entry>Z_ReferenceId</entry><entry>NULL
        </entry></row>
       <row><entry>
        referenceId</entry><entry>Z_ReferenceId</entry><entry>NULL
        </entry></row>

@@ -867,7 +867,7 @@ typedef struct Z_ext_typeent
      </tbody>
     </tgroup>
    </table>
      </tbody>
     </tgroup>
    </table>

-   
+

    <table frame="top" id="asn.default.access.control.request">
     <title>Default settings for Access Control Request</title>
     <tgroup cols="3">
    <table frame="top" id="asn.default.access.control.request">
     <title>Default settings for Access Control Request</title>
     <tgroup cols="3">

@@ -882,7 +882,7 @@ typedef struct Z_ext_typeent
       </row>
      </thead>
      <tbody>
       </row>
      </thead>
      <tbody>

-      
+

       <row><entry>
        referenceId</entry><entry>Z_ReferenceId</entry><entry>NULL
        </entry></row>
       <row><entry>
        referenceId</entry><entry>Z_ReferenceId</entry><entry>NULL
        </entry></row>

@@ -913,7 +913,7 @@ typedef struct Z_ext_typeent
       </row>
      </thead>
      <tbody>
       </row>
      </thead>
      <tbody>

-      
+

       <row><entry>
        referenceId</entry><entry>Z_ReferenceId</entry><entry>NULL
        </entry></row>
       <row><entry>
        referenceId</entry><entry>Z_ReferenceId</entry><entry>NULL
        </entry></row>

@@ -947,7 +947,7 @@ typedef struct Z_ext_typeent
       </row>
      </thead>
      <tbody>
       </row>
      </thead>
      <tbody>

-      
+

       <row><entry>
        referenceId</entry><entry>Z_ReferenceId</entry><entry>NULL
        </entry></row>
       <row><entry>
        referenceId</entry><entry>Z_ReferenceId</entry><entry>NULL
        </entry></row>

@@ -999,7 +999,7 @@ typedef struct Z_ext_typeent
       <row><entry>
        otherInfo</entry><entry>Z_OtherInformation</entry><entry>NULL
        </entry></row>
       <row><entry>
        otherInfo</entry><entry>Z_OtherInformation</entry><entry>NULL
        </entry></row>

-      
+

      </tbody>
     </tgroup>
    </table>
      </tbody>
     </tgroup>
    </table>

diff --git a/doc/bib1-attr-man.xml b/doc/bib1-attr-man.xml
index c38ff9b..78e1464 100644 (file)
--- a/doc/bib1-attr-man.xml
+++ b/doc/bib1-attr-man.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN" 
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN"

  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
 [
      <!ENTITY % local SYSTEM "local.ent">
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
 [
      <!ENTITY % local SYSTEM "local.ent">

@@ -14,18 +14,18 @@
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>

- 
+

  <refmeta>
   <refentrytitle>Bib-1 Attribute Set</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo class="manual">Conventions and miscellaneous</refmiscinfo>
  </refmeta>
  <refmeta>
   <refentrytitle>Bib-1 Attribute Set</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo class="manual">Conventions and miscellaneous</refmiscinfo>
  </refmeta>

- 
+

  <refnamediv>
   <refname>bib1-attr</refname>
   <refpurpose>Bib-1 Attribute Set</refpurpose>
  </refnamediv>
  <refnamediv>
   <refname>bib1-attr</refname>
   <refpurpose>Bib-1 Attribute Set</refpurpose>
  </refnamediv>

- 
+

  <refsect1><title>DESCRIPTION</title>
   <para>
    This reference entry lists the Bib-1 attribute set types and values.
  <refsect1><title>DESCRIPTION</title>
   <para>
    This reference entry lists the Bib-1 attribute set types and values.

@@ -38,7 +38,7 @@
    Position (3), Structure (4), Truncation (5) and completeness (6).
   </para>
  </refsect1>
    Position (3), Structure (4), Truncation (5) and completeness (6).
   </para>
  </refsect1>

- 
+

  <refsect1><title>USE (1)</title>
   <para>
    <screen>
  <refsect1><title>USE (1)</title>
   <para>
    <screen>

@@ -144,7 +144,7 @@
    </screen>
   </para>
  </refsect1>
    </screen>
   </para>
  </refsect1>

- 
+

  <refsect1><title>RELATION (2)</title>
   <para>
    <screen>
  <refsect1><title>RELATION (2)</title>
   <para>
    <screen>

@@ -161,7 +161,7 @@
    </screen>
   </para>
  </refsect1>
    </screen>
   </para>
  </refsect1>

- 
+

  <refsect1><title>POSITION (3)</title>
   <para>
    <screen>
  <refsect1><title>POSITION (3)</title>
   <para>
    <screen>

@@ -171,7 +171,7 @@
    </screen>
   </para>
  </refsect1>
    </screen>
   </para>
  </refsect1>

- 
+

  <refsect1><title>STRUCTURE (4)</title>
   <para>
    <screen>
  <refsect1><title>STRUCTURE (4)</title>
   <para>
    <screen>

@@ -217,7 +217,7 @@
    </screen>
   </para>
  </refsect1>
    </screen>
   </para>
  </refsect1>

- 
+

  <refsect1><title>COMPLETENSS (6)</title>
   <para>
    <screen>
  <refsect1><title>COMPLETENSS (6)</title>
   <para>
    <screen>

@@ -227,7 +227,7 @@
    </screen>
   </para>
  </refsect1>
    </screen>
   </para>
  </refsect1>

- 
+

  <refsect1><title>SORTING (7)</title>
   <para>
    <screen>
  <refsect1><title>SORTING (7)</title>
   <para>
    <screen>

@@ -240,7 +240,7 @@
     embedding a sort critieria into a query.
   </para>
  </refsect1>
     embedding a sort critieria into a query.
   </para>
  </refsect1>

- 
+

 
  <refsect1><title>SEE ALSO</title>
   <para>
 
  <refsect1><title>SEE ALSO</title>
   <para>

diff --git a/doc/comstack.xml b/doc/comstack.xml
index 65e3d1d..fe2d937 100644 (file)
--- a/doc/comstack.xml
+++ b/doc/comstack.xml
@@ -1,7 +1,7 @@
  <chapter id="comstack"><title>The COMSTACK Module</title>
  <chapter id="comstack"><title>The COMSTACK Module</title>

-  
+

   <sect1 id="comstack.synopsis"><title>Synopsis (blocking mode)</title>
   <sect1 id="comstack.synopsis"><title>Synopsis (blocking mode)</title>

-   
+

    <programlisting><![CDATA[
     COMSTACK stack;
     char *buf = 0;
    <programlisting><![CDATA[
     COMSTACK stack;
     char *buf = 0;

@@ -18,27 +18,27 @@
         perror("cs_create");  /* use perror() here since we have no stack yet */
         return -1;
     }
         perror("cs_create");  /* use perror() here since we have no stack yet */
         return -1;
     }

-    
+

     server_address_ip = cs_straddr(stack, server_address_str);
     if (!server_address_ip)
     {
         fprintf(stderr, "cs_straddr: address could not be resolved\n");
         return -1;
     }
     server_address_ip = cs_straddr(stack, server_address_str);
     if (!server_address_ip)
     {
         fprintf(stderr, "cs_straddr: address could not be resolved\n");
         return -1;
     }

-    
+

     status = cs_connect(stack, server_address_ip);
     if (status != 0) {
         fprintf(stderr, "cs_connect: %s\n", cs_strerror(stack));
         return -1;
     }
     status = cs_connect(stack, server_address_ip);
     if (status != 0) {
         fprintf(stderr, "cs_connect: %s\n", cs_strerror(stack));
         return -1;
     }

-    
+

     status = cs_put(stack, protocol_package, protocol_package_length);
     if (status) {
         fprintf(stderr, "cs_put: %s\n", cs_strerror(stack));
         return -1;
     }
     /* Now get a response */
     status = cs_put(stack, protocol_package, protocol_package_length);
     if (status) {
         fprintf(stderr, "cs_put: %s\n", cs_strerror(stack));
         return -1;
     }
     /* Now get a response */

-    
+

     length_incoming = cs_get(stack, &buf, &size);
     if (!length_incoming) {
         fprintf(stderr, "Connection closed\n");
     length_incoming = cs_get(stack, &buf, &size);
     if (!length_incoming) {
         fprintf(stderr, "Connection closed\n");

@@ -47,10 +47,10 @@
         fprintf(stderr, "cs_get: %s\n", cs_strerror(stack));
         return -1;
     }
         fprintf(stderr, "cs_get: %s\n", cs_strerror(stack));
         return -1;
     }

-    
+

     /* Print result */
     fwrite(buf, length_incoming, 1, stdout);
     /* Print result */
     fwrite(buf, length_incoming, 1, stdout);

-    
+

     /* clean up */
     cs_close(stack);
     if (buf)
     /* clean up */
     cs_close(stack);
     if (buf)

@@ -74,7 +74,7 @@
     of losing generality, and it may prove that the interface will need
     extension later on.
    </para>
     of losing generality, and it may prove that the interface will need
     extension later on.
    </para>

-   
+

    <note>
     <para>
      There hasn't been interest in the XTImOSI stack for some years.
    <note>
     <para>
      There hasn't been interest in the XTImOSI stack for some years.

@@ -111,20 +111,20 @@
     <synopsis>
      COMSTACK cs_create(CS_TYPE type, int blocking, int protocol);
     </synopsis>
     <synopsis>
      COMSTACK cs_create(CS_TYPE type, int blocking, int protocol);
     </synopsis>

-    
+

     <para>
      Creates an instance of the protocol stack - a communications endpoint.
      The <literal>type</literal> parameter determines the mode
      of communication. At present the following values are supported:
     </para>
     <para>
      Creates an instance of the protocol stack - a communications endpoint.
      The <literal>type</literal> parameter determines the mode
      of communication. At present the following values are supported:
     </para>

-    
+

     <variablelist>
      <varlistentry><term><literal>tcpip_type</literal></term>
       <listitem><para>TCP/IP (BER over TCP/IP or HTTP over TCP/IP)
        </para></listitem>
      </varlistentry>
      <varlistentry><term><literal>ssl_type</literal></term>
     <variablelist>
      <varlistentry><term><literal>tcpip_type</literal></term>
       <listitem><para>TCP/IP (BER over TCP/IP or HTTP over TCP/IP)
        </para></listitem>
      </varlistentry>
      <varlistentry><term><literal>ssl_type</literal></term>

-      <listitem><para>Secure Socket Layer (SSL). This COMSTACK 
+      <listitem><para>Secure Socket Layer (SSL). This COMSTACK

         is experimental and is not fully implemented. If
         HTTP is used, this effectively is HTTPS.
        </para></listitem>
         is experimental and is not fully implemented. If
         HTTP is used, this effectively is HTTPS.
        </para></listitem>

@@ -136,7 +136,7 @@
        </para></listitem>
       </varlistentry>
      </variablelist>
        </para></listitem>
       </varlistentry>
      </variablelist>

-     
+

     <para>
      The <function>cs_create</function> function returns a null-pointer
      if a system error occurs.
     <para>
      The <function>cs_create</function> function returns a null-pointer
      if a system error occurs.

@@ -454,7 +454,7 @@
    <para>
     For UNIX sockets, the format of an address is the socket filename.
    </para>
    <para>
     For UNIX sockets, the format of an address is the socket filename.
    </para>

-   
+

    <para>
     When a connection has been established, you can use
    </para>
    <para>
     When a connection has been established, you can use
    </para>

@@ -535,7 +535,7 @@
    </para>
 
   </sect1>
    </para>
 
   </sect1>

-  
+

   <sect1 id="comstack.diagnostics"><title>Diagnostics</title>
 
    <para>
   <sect1 id="comstack.diagnostics"><title>Diagnostics</title>
 
    <para>

@@ -567,39 +567,39 @@
    <synopsis>
     const char *cs_errmsg(int n);
    </synopsis>
    <synopsis>
     const char *cs_errmsg(int n);
    </synopsis>

-   
+

    <para>
     It is also possible to get straight to the textual represenataion
    <para>
     It is also possible to get straight to the textual represenataion

-    without the error code by using 
+    without the error code by using

     <function>cs_strerror</function>.
    </para>
     <function>cs_strerror</function>.
    </para>

-   
+

    <synopsis>
     const char *cs_strerror(COMSTACK h);
    </synopsis>
    <synopsis>
     const char *cs_strerror(COMSTACK h);
    </synopsis>

-   
+

   </sect1>
   <sect1 id="comstack.summary"><title>Summary and Synopsis</title>
 
    <synopsis><![CDATA[
     #include <yaz/comstack.h>
   </sect1>
   <sect1 id="comstack.summary"><title>Summary and Synopsis</title>
 
    <synopsis><![CDATA[
     #include <yaz/comstack.h>

-    
+

     #include <yaz/tcpip.h>  /* this is for TCP/IP and SSL support */
     #include <yaz/unix.h>   /* this is for UNIX socket support */
     #include <yaz/tcpip.h>  /* this is for TCP/IP and SSL support */
     #include <yaz/unix.h>   /* this is for UNIX socket support */

-    
+

     COMSTACK cs_create(CS_TYPE type, int blocking, int protocol);
     COMSTACK cs_create(CS_TYPE type, int blocking, int protocol);

-     
+

     COMSTACK cs_createbysocket(int s, CS_TYPE type, int blocking,
                                int protocol);
     COMSTACK cs_create_host(const char *str, int blocking,
                             void **vp);
     COMSTACK cs_createbysocket(int s, CS_TYPE type, int blocking,
                                int protocol);
     COMSTACK cs_create_host(const char *str, int blocking,
                             void **vp);

-     
+

     int cs_bind(COMSTACK handle, int mode);
     int cs_bind(COMSTACK handle, int mode);

-     
+

     int cs_connect(COMSTACK handle, void *address);
     int cs_connect(COMSTACK handle, void *address);

-     
+

     int cs_rcvconnect(COMSTACK handle);
     int cs_rcvconnect(COMSTACK handle);

-     
+

     int cs_listen(COMSTACK handle);
 
     COMSTACK cs_accept(COMSTACK handle);
     int cs_listen(COMSTACK handle);
 
     COMSTACK cs_accept(COMSTACK handle);

diff --git a/doc/credits.xml b/doc/credits.xml
index e015d83..222a1f9 100644 (file)
--- a/doc/credits.xml
+++ b/doc/credits.xml
@@ -5,7 +5,7 @@
    fixes or suggestions. If we're missing somebody, of if you, for
    whatever reason, don't like to be listed here, let us know.
   </para>
    fixes or suggestions. If we're missing somebody, of if you, for
    whatever reason, don't like to be listed here, let us know.
   </para>

-  
+

   <itemizedlist>
    <listitem><para>
      Gary Anderson
   <itemizedlist>
    <listitem><para>
      Gary Anderson

@@ -102,7 +102,7 @@
     </para></listitem>
   </itemizedlist>
  </appendix>
     </para></listitem>
   </itemizedlist>
  </appendix>

- 
+

  <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml
  <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml

diff --git a/doc/future.xml b/doc/future.xml
index b3f6f9a..875741e 100644 (file)
--- a/doc/future.xml
+++ b/doc/future.xml
@@ -1,5 +1,5 @@
  <chapter id="future"><title>Future Directions</title>
  <chapter id="future"><title>Future Directions</title>

-  
+

   <para>
    We have a new and better version of the front-end server on the drawing
    board. Resources and external commitments will govern when we'll be
   <para>
    We have a new and better version of the front-end server on the drawing
    board. Resources and external commitments will govern when we'll be

@@ -7,7 +7,7 @@
    flexibility, greater support for access/resource control, and easy
    support for Explain (possibly with Zebra as an extra database engine).
   </para>
    flexibility, greater support for access/resource control, and easy
    support for Explain (possibly with Zebra as an extra database engine).
   </para>

-  
+

   <para>
    &yaz; is a BER toolkit and as such should support all protocols
    out there based on that. We'd like to see running ILL applications.
   <para>
    &yaz; is a BER toolkit and as such should support all protocols
    out there based on that. We'd like to see running ILL applications.

@@ -15,7 +15,7 @@
    LDAP. Maybe a generic framework for doing IR using both LDAP and
    Z39.50 transparently.
   </para>
    LDAP. Maybe a generic framework for doing IR using both LDAP and
    Z39.50 transparently.
   </para>

-  
+

   <para>
    The SOAP implementation is incomplete. In the future we hope
    to add more features to it. Perhaps make a WSDL/XML Schema compiler.
   <para>
    The SOAP implementation is incomplete. In the future we hope
    to add more features to it. Perhaps make a WSDL/XML Schema compiler.

@@ -25,7 +25,7 @@
 
   <para>
    It would be neat to have a proper module mechanism for the Generic
 
   <para>
    It would be neat to have a proper module mechanism for the Generic

-   Frontend Server so that backend would be dynamically 
+   Frontend Server so that backend would be dynamically

    loaded (as shared objects / DLLs).
   </para>
 
    loaded (as shared objects / DLLs).
   </para>
 

@@ -37,7 +37,7 @@
   </para>
 
  </chapter>
   </para>
 
  </chapter>

- 
+

  <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml
  <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml

diff --git a/doc/gfs-options.xml b/doc/gfs-options.xml
index c3ed444..39bc66f 100644 (file)
--- a/doc/gfs-options.xml
+++ b/doc/gfs-options.xml
@@ -1,10 +1,10 @@
-<!-- 
+<!--

    Options for generic frontend server and yaz-ztest.
    Included in both manual and man page for yaz-ztest
 -->
 
 <variablelist>
    Options for generic frontend server and yaz-ztest.
    Included in both manual and man page for yaz-ztest
 -->
 
 <variablelist>

- 
+

  <varlistentry><term><literal>-a </literal>
    <replaceable>file</replaceable></term>
   <listitem><para>
  <varlistentry><term><literal>-a </literal>
    <replaceable>file</replaceable></term>
   <listitem><para>

@@ -12,7 +12,7 @@
     The special name <literal>-</literal> (dash) sends output to
     <literal>stderr</literal>.
    </para></listitem></varlistentry>
     The special name <literal>-</literal> (dash) sends output to
     <literal>stderr</literal>.
    </para></listitem></varlistentry>

- 
+

  <varlistentry><term><literal>-S</literal></term>
   <listitem><para>
     Don't fork or make threads on connection requests. This is good for
  <varlistentry><term><literal>-S</literal></term>
   <listitem><para>
     Don't fork or make threads on connection requests. This is good for

@@ -21,13 +21,13 @@
     a software malfunction (okay then, a crash) from affecting all
     current users.
    </para></listitem></varlistentry>
     a software malfunction (okay then, a crash) from affecting all
     current users.
    </para></listitem></varlistentry>

- 
+

  <varlistentry><term><literal>-1</literal></term>
   <listitem><para>
     Like <literal>-S</literal> but after one session the server
     exits. This mode is for debugging <emphasis>only</emphasis>.
    </para></listitem></varlistentry>
  <varlistentry><term><literal>-1</literal></term>
   <listitem><para>
     Like <literal>-S</literal> but after one session the server
     exits. This mode is for debugging <emphasis>only</emphasis>.
    </para></listitem></varlistentry>

- 
+

  <varlistentry><term><literal>-T</literal></term>
   <listitem><para>
     Operate the server in threaded mode. The server creates a thread
  <varlistentry><term><literal>-T</literal></term>
   <listitem><para>
     Operate the server in threaded mode. The server creates a thread

@@ -94,7 +94,7 @@
  <varlistentry><term><literal>-w </literal>
    <replaceable>dir</replaceable></term>
   <listitem><para>
  <varlistentry><term><literal>-w </literal>
    <replaceable>dir</replaceable></term>
   <listitem><para>

-    The server changes to this directory during before listening 
+    The server changes to this directory during before listening

     on incoming connections. This option is useful
     when the server is operating from the <application>inetd</application>
     daemon (see <literal>-i</literal>).
     on incoming connections. This option is useful
     when the server is operating from the <application>inetd</application>
     daemon (see <literal>-i</literal>).

@@ -104,7 +104,7 @@
    <replaceable>pidfile</replaceable></term>
   <listitem><para>
     Specifies that the server should write its Process ID to
    <replaceable>pidfile</replaceable></term>
   <listitem><para>
     Specifies that the server should write its Process ID to

-    file given by <replaceable>pidfile</replaceable>. 
+    file given by <replaceable>pidfile</replaceable>.

     A typical location would be <filename>/var/run/yaz-ztest.pid</filename>.
    </para></listitem></varlistentry>
 
     A typical location would be <filename>/var/run/yaz-ztest.pid</filename>.
    </para></listitem></varlistentry>
 

@@ -113,40 +113,40 @@
     Use this to make the the server run from the
     <application>inetd</application> server (UNIX only).
    </para></listitem></varlistentry>
     Use this to make the the server run from the
     <application>inetd</application> server (UNIX only).
    </para></listitem></varlistentry>

- 
+

  <varlistentry><term><literal>-D</literal></term>
   <listitem><para>
     Use this to make the server put itself in the background and
  <varlistentry><term><literal>-D</literal></term>
   <listitem><para>
     Use this to make the server put itself in the background and

-    run as a daemon. If neither <literal>-i</literal> nor 
+    run as a daemon. If neither <literal>-i</literal> nor

     <literal>-D</literal> is given, the server starts in the foreground.
    </para></listitem></varlistentry>
     <literal>-D</literal> is given, the server starts in the foreground.
    </para></listitem></varlistentry>

- 
+

  <varlistentry><term><literal>-install</literal></term>
   <listitem><para>
     Use this to install the server as an NT service
  <varlistentry><term><literal>-install</literal></term>
   <listitem><para>
     Use this to install the server as an NT service

-    (Windows NT/2000/XP only). 
+    (Windows NT/2000/XP only).

     Control the server by going to the Services in the Control Panel.
    </para></listitem></varlistentry>
     Control the server by going to the Services in the Control Panel.
    </para></listitem></varlistentry>

- 
+

  <varlistentry><term><literal>-installa</literal></term>
   <listitem><para>
     Use this to install and activate the server as an NT service
  <varlistentry><term><literal>-installa</literal></term>
   <listitem><para>
     Use this to install and activate the server as an NT service

-    (Windows NT/2000/XP only). 
+    (Windows NT/2000/XP only).

     Control the server by going to the Services in the Control Panel.
    </para></listitem></varlistentry>
     Control the server by going to the Services in the Control Panel.
    </para></listitem></varlistentry>

- 
+

  <varlistentry><term><literal>-remove</literal></term>
   <listitem><para>
     Use this to remove the server from the NT services
  <varlistentry><term><literal>-remove</literal></term>
   <listitem><para>
     Use this to remove the server from the NT services

-    (Windows NT/2000/XP only). 
+    (Windows NT/2000/XP only).

    </para></listitem></varlistentry>
    </para></listitem></varlistentry>

- 
+

  <varlistentry><term><literal>-t </literal>
    <replaceable>minutes</replaceable></term>
   <listitem><para>
     Idle session timeout, in minutes.
    </para></listitem></varlistentry>
  <varlistentry><term><literal>-t </literal>
    <replaceable>minutes</replaceable></term>
   <listitem><para>
     Idle session timeout, in minutes.
    </para></listitem></varlistentry>

- 
+

  <varlistentry><term><literal>-k </literal>
    <replaceable>size</replaceable></term>
   <listitem><para>
  <varlistentry><term><literal>-k </literal>
    <replaceable>size</replaceable></term>
   <listitem><para>

@@ -180,7 +180,7 @@
      <refentrytitle>hosts_access</refentrytitle>
      <manvolnum>5</manvolnum>
     </citerefentry>
      <refentrytitle>hosts_access</refentrytitle>
      <manvolnum>5</manvolnum>
     </citerefentry>

-    and 
+    and

     <citerefentry>
      <refentrytitle>tcpd</refentrytitle>
      <manvolnum>8</manvolnum>
     <citerefentry>
      <refentrytitle>tcpd</refentrytitle>
      <manvolnum>8</manvolnum>

@@ -195,7 +195,7 @@
    the input format to <literal>strftime()</literal>.
    </para></listitem>
  </varlistentry>
    the input format to <literal>strftime()</literal>.
    </para></listitem>
  </varlistentry>

- 
+

 </variablelist>
 
 <!-- Keep this comment at the end of the file
 </variablelist>
 
 <!-- Keep this comment at the end of the file

diff --git a/doc/gfs-synopsis.xml b/doc/gfs-synopsis.xml
index babc5e3..c868251 100644 (file)
--- a/doc/gfs-synopsis.xml
+++ b/doc/gfs-synopsis.xml
@@ -1,4 +1,4 @@
-<!-- 
+<!--

    cmd description of YAZ GFS application.
    Included in both manual and man page for yaz-ztest
 -->
    cmd description of YAZ GFS application.
    Included in both manual and man page for yaz-ztest
 -->

diff --git a/doc/gfs-virtual.xml b/doc/gfs-virtual.xml
index 56b2cc3..18d68dd 100644 (file)
--- a/doc/gfs-virtual.xml
+++ b/doc/gfs-virtual.xml
@@ -1,4 +1,4 @@
-<!-- 
+<!--

    Description of the virtual host mechanism in YAZ GFS
    Included in both manual and man page for yaz-ztest
 -->
    Description of the virtual host mechanism in YAZ GFS
    Included in both manual and man page for yaz-ztest
 -->

@@ -29,7 +29,7 @@
 </note>
 <para>
  The YAZ frontend server uses XML to describe the backend
 </note>
 <para>
  The YAZ frontend server uses XML to describe the backend

- configurations. Command-line option <literal>-f</literal> 
+ configurations. Command-line option <literal>-f</literal>

  specifies filename of the XML configuration.
 </para>
 <para>
  specifies filename of the XML configuration.
 </para>
 <para>

@@ -39,14 +39,14 @@
 </para>
 <para>
  The <literal>listen</literal> describes listener (transport end point),
 </para>
 <para>
  The <literal>listen</literal> describes listener (transport end point),

- such as TCP/IP, Unix file socket or SSL server. Content for 
+ such as TCP/IP, Unix file socket or SSL server. Content for

  a listener:
  <variablelist>
   <varlistentry><term>CDATA (required)</term>
    <listitem>
     <para>
      The CDATA for the <literal>listen</literal> element holds the
  a listener:
  <variablelist>
   <varlistentry><term>CDATA (required)</term>
    <listitem>
     <para>
      The CDATA for the <literal>listen</literal> element holds the

-     listener string, such as <literal>tcp:@:210</literal>, 
+     listener string, such as <literal>tcp:@:210</literal>,

      <literal>tcp:server1:2100</literal>,
      etc.
     </para>
      <literal>tcp:server1:2100</literal>,
      etc.
     </para>

@@ -129,7 +129,7 @@
     <para>
      Specifies a filename that includes CQL to RPN conversion for this
      backend server. See &reference-tools-cql-map;
     <para>
      Specifies a filename that includes CQL to RPN conversion for this
      backend server. See &reference-tools-cql-map;

-     If given, the backend server will only "see" a Type-1/RPN query. 
+     If given, the backend server will only "see" a Type-1/RPN query.

     </para>
    </listitem>
   </varlistentry>
     </para>
    </listitem>
   </varlistentry>

@@ -139,7 +139,7 @@
     <para>
      Specifies a filename that includes CCL to RPN conversion for this
      backend server. See &reference-tools-ccl-qualifiers;
     <para>
      Specifies a filename that includes CCL to RPN conversion for this
      backend server. See &reference-tools-ccl-qualifiers;

-     If given, the backend server will only "see" a Type-1/RPN query. 
+     If given, the backend server will only "see" a Type-1/RPN query.

     </para>
    </listitem>
   </varlistentry>
     </para>
    </listitem>
   </varlistentry>

@@ -154,7 +154,7 @@
     </para>
    </listitem>
   </varlistentry>
     </para>
    </listitem>
   </varlistentry>

-   
+

   <varlistentry><term>element <literal>docpath</literal> (optional)</term>
    <listitem>
     <para>
   <varlistentry><term>element <literal>docpath</literal> (optional)</term>
    <listitem>
     <para>

@@ -167,7 +167,7 @@
     </para>
    </listitem>
   </varlistentry>
     </para>
    </listitem>
   </varlistentry>

-   
+

   <varlistentry><term>element <literal>explain</literal> (optional)</term>
    <listitem>
     <para>
   <varlistentry><term>element <literal>explain</literal> (optional)</term>
    <listitem>
     <para>

@@ -200,10 +200,10 @@
     </para>
    </listitem>
   </varlistentry>
     </para>
    </listitem>
   </varlistentry>

-   
+

  </variablelist>
 </para>
  </variablelist>
 </para>

- 
+

 <para>
  The XML below configures a server that accepts connections from
  two ports, TCP/IP port 9900 and a local UNIX file socket.
 <para>
  The XML below configures a server that accepts connections from
  two ports, TCP/IP port 9900 and a local UNIX file socket.

diff --git a/doc/installation.xml b/doc/installation.xml
index 25c0ef1..4e61cbe 100644 (file)
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -1,5 +1,5 @@
 <chapter id="installation"><title>Compilation and Installation</title>
 <chapter id="installation"><title>Compilation and Installation</title>

-  
+

   <sect1 id="installation-introduction"><title>Introduction</title>
    <para>
     The latest version of the software will generally be found at:
   <sect1 id="installation-introduction"><title>Introduction</title>
    <para>
     The latest version of the software will generally be found at:

@@ -10,7 +10,7 @@
    <para>
     We have tried our best to keep the software portable, and on many
     platforms, you should be able to compile everything with little or
    <para>
     We have tried our best to keep the software portable, and on many
     platforms, you should be able to compile everything with little or

-    no changes. 
+    no changes.

    </para>
 
    <para>
    </para>
 
    <para>

@@ -23,7 +23,7 @@
     <ulink url="&url.solaris;">SunOS 5.10 (sparc)</ulink>,
     Windows 7, Windows Xp.
    </para>
     <ulink url="&url.solaris;">SunOS 5.10 (sparc)</ulink>,
     Windows 7, Windows Xp.
    </para>

-   
+

    <para>
     Some versions have be known to work on HP/UX,
     DEC Unix, <ulink url="&url.netbsd;">NetBSD</ulink>,
    <para>
     Some versions have be known to work on HP/UX,
     DEC Unix, <ulink url="&url.netbsd;">NetBSD</ulink>,

@@ -43,33 +43,33 @@
     <literal>#ifdefs</literal> for individual platforms, and we'd
     like to keep it that way as far as it makes sense.
    </para>
     <literal>#ifdefs</literal> for individual platforms, and we'd
     like to keep it that way as far as it makes sense.
    </para>

-   
+

    <para>
     We maintain a mailing-list for the purpose of announcing new releases and
    <para>
     We maintain a mailing-list for the purpose of announcing new releases and

-    bug-fixes, as well as general discussion. Subscribe by 
+    bug-fixes, as well as general discussion. Subscribe by

     filling-in the form
     <ulink url="&url.yaz.mailinglist;">here</ulink>.
     filling-in the form
     <ulink url="&url.yaz.mailinglist;">here</ulink>.

-    General questions and problems can be directed at 
+    General questions and problems can be directed at

     <ulink url="&url.yaz.mail;"/>, or the address given at the top of
      this document.
    </para>
     <ulink url="&url.yaz.mail;"/>, or the address given at the top of
      this document.
    </para>

-   
+

   </sect1>
   <sect1 id="installation.unix"><title>UNIX</title>
 
    <para>
   </sect1>
   <sect1 id="installation.unix"><title>UNIX</title>
 
    <para>

-    We provide 
+    We provide

     <ulink url="&url.debian;">Debian GNU/Linux</ulink> (i386 and amd64),
     <ulink url="&url.ubuntu;">Ubuntu</ulink> (i386 and amd64)
     <ulink url="&url.debian;">Debian GNU/Linux</ulink> (i386 and amd64),
     <ulink url="&url.ubuntu;">Ubuntu</ulink> (i386 and amd64)

-    and 
-    <ulink url="&url.centos;">CentOS</ulink> (amd64 only) packages for &yaz;. 
+    and
+    <ulink url="&url.centos;">CentOS</ulink> (amd64 only) packages for &yaz;.

     You should be able to create packages for other CPUs by building
     them from the source package.
    </para>
     You should be able to create packages for other CPUs by building
     them from the source package.
    </para>

-   
+

    <para>
     YAZ is also part of several packages repositories. Some of them are
    <para>
     YAZ is also part of several packages repositories. Some of them are

-   </para>    
+   </para>

 
    <itemizedlist>
     <listitem>
 
    <itemizedlist>
     <listitem>

@@ -110,10 +110,10 @@
      </para>
     </listitem>
    </itemizedlist>
      </para>
     </listitem>
    </itemizedlist>

-    
+

    <sect2 id="installation.source.unix">
     <title>Compiling from source on Unix</title>
    <sect2 id="installation.source.unix">
     <title>Compiling from source on Unix</title>

-    
+

     <para>
      Note that if your system doesn't have a native ANSI C compiler, you may
      have to acquire one separately. We recommend
     <para>
      Note that if your system doesn't have a native ANSI C compiler, you may
      have to acquire one separately. We recommend

@@ -124,13 +124,13 @@
      If you wish to use character set conversion facilities in &yaz; or if you
      are compiling &yaz; for use with Zebra it is a good idea to ensure that
      the iconv library is installed. Some Unixes today already have it
      If you wish to use character set conversion facilities in &yaz; or if you
      are compiling &yaz; for use with Zebra it is a good idea to ensure that
      the iconv library is installed. Some Unixes today already have it

-     - if not, we suggest 
+     - if not, we suggest

      <ulink url="&url.libiconv;">GNU libiconv</ulink>.
     </para>
 
     <para>
      <ulink url="&url.libiconv;">GNU libiconv</ulink>.
     </para>
 
     <para>

-     YAZ 3.0.16 and later includes a wrapper for the 
-     <ulink url="&url.icu;">ICU</ulink> 
+     YAZ 3.0.16 and later includes a wrapper for the
+     <ulink url="&url.icu;">ICU</ulink>

      (International Components for Unicode).
      In order to use this, the developer version of the ICU library
      must be available.
      (International Components for Unicode).
      In order to use this, the developer version of the ICU library
      must be available.

@@ -160,24 +160,24 @@
      GNU <ulink url="&url.bison;">Bison</ulink>.
      This tool is only needed if you're using the CVS version of &yaz;.
     </para>
      GNU <ulink url="&url.bison;">Bison</ulink>.
      This tool is only needed if you're using the CVS version of &yaz;.
     </para>

-        
+

     <para>
      &yaz; includes a tiny ASN.1 compiler. This compiler is
      written in <ulink url="&url.tcl;">Tcl</ulink>.
      But as for Bison you do not need it unless you're using CVS
      version of &yaz; or you're using the compiler to built own codecs
     <para>
      &yaz; includes a tiny ASN.1 compiler. This compiler is
      written in <ulink url="&url.tcl;">Tcl</ulink>.
      But as for Bison you do not need it unless you're using CVS
      version of &yaz; or you're using the compiler to built own codecs

-     for private ASN.1. 
+     for private ASN.1.

     </para>
     </para>

-     
+

     <para>
      Generally it should be sufficient to run configure without options,
      like this:
     </para>
     <para>
      Generally it should be sufficient to run configure without options,
      like this:
     </para>

-    
+

     <screen>
      ./configure
     </screen>
     <screen>
      ./configure
     </screen>

-    
+

     <para>
      The configure script attempts to use use the C compiler specified by
      the <literal>CC</literal> environment variable. If not set, GNU C will be
     <para>
      The configure script attempts to use use the C compiler specified by
      the <literal>CC</literal> environment variable. If not set, GNU C will be

@@ -186,15 +186,15 @@
      Bourne-compatible shell you may pass something like this to use a
      particular C compiler with optimization enabled:
     </para>
      Bourne-compatible shell you may pass something like this to use a
      particular C compiler with optimization enabled:
     </para>

-    
+

     <screen>
      CC=/opt/ccs/bin/cc CFLAGS=-O ./configure
     </screen>
     <screen>
      CC=/opt/ccs/bin/cc CFLAGS=-O ./configure
     </screen>

-    
+

     <para>
      To customize &yaz;, the configure script also accepts a set of options.
      The most important are:
     <para>
      To customize &yaz;, the configure script also accepts a set of options.
      The most important are:

-     
+

      <variablelist>
       <varlistentry><term>
         <literal>--prefix</literal>=<replaceable>prefix</replaceable></term>
      <variablelist>
       <varlistentry><term>
         <literal>--prefix</literal>=<replaceable>prefix</replaceable></term>

@@ -215,7 +215,7 @@
           <refentrytitle>hosts_access</refentrytitle>
           <manvolnum>5</manvolnum>
          </citerefentry>
           <refentrytitle>hosts_access</refentrytitle>
           <manvolnum>5</manvolnum>
          </citerefentry>

-         and 
+         and

          <citerefentry>
           <refentrytitle>tcpd</refentrytitle>
           <manvolnum>8</manvolnum>
          <citerefentry>
           <refentrytitle>tcpd</refentrytitle>
           <manvolnum>8</manvolnum>

@@ -245,14 +245,14 @@
          equivalent to <literal>--enable-static</literal>.
         </para></listitem>
       </varlistentry>
          equivalent to <literal>--enable-static</literal>.
         </para></listitem>
       </varlistentry>

-      
+

       <varlistentry><term>
         <literal>--with-iconv</literal>[=<replaceable>prefix</replaceable>]
        </term>
        <listitem><para>Compile &yaz; with iconv library in directory
          <replaceable>prefix</replaceable>. By default configure will
          search for iconv on the system. Use this option if it
       <varlistentry><term>
         <literal>--with-iconv</literal>[=<replaceable>prefix</replaceable>]
        </term>
        <listitem><para>Compile &yaz; with iconv library in directory
          <replaceable>prefix</replaceable>. By default configure will
          search for iconv on the system. Use this option if it

-         doesn't find iconv. Alternatively, 
+         doesn't find iconv. Alternatively,

          <literal>--without-iconv</literal>, can be uset to force &yaz;
         not to use iconv.
         </para></listitem>
          <literal>--without-iconv</literal>, can be uset to force &yaz;
         not to use iconv.
         </para></listitem>

@@ -261,13 +261,13 @@
       <varlistentry><term>
         <literal>--with-xslt</literal>[=<replaceable>prefix</replaceable>]
        </term>
       <varlistentry><term>
         <literal>--with-xslt</literal>[=<replaceable>prefix</replaceable>]
        </term>

-       <listitem><para>Compile &yaz; with 
+       <listitem><para>Compile &yaz; with

          <ulink url="&url.libxslt;">libxslt</ulink> in directory
          <ulink url="&url.libxslt;">libxslt</ulink> in directory

-         <replaceable>prefix</replaceable>. 
+         <replaceable>prefix</replaceable>.

          Use this option if you want XSLT and XML support.
          By default, configure will
          search for libxslt on the system. Use this option if it
          Use this option if you want XSLT and XML support.
          By default, configure will
          search for libxslt on the system. Use this option if it

-         libxslt is not found automatically. Alternatively, 
+         libxslt is not found automatically. Alternatively,

          <literal>--without-xslt</literal>, can be used to force &yaz;
         not to use libxslt.
         </para>
          <literal>--without-xslt</literal>, can be used to force &yaz;
         not to use libxslt.
         </para>

@@ -277,13 +277,13 @@
       <varlistentry><term>
         <literal>--with-xml2</literal>[=<replaceable>prefix</replaceable>]
        </term>
       <varlistentry><term>
         <literal>--with-xml2</literal>[=<replaceable>prefix</replaceable>]
        </term>

-       <listitem><para>Compile &yaz; with 
+       <listitem><para>Compile &yaz; with

          <ulink url="&url.libxml2;">libxml2</ulink> in directory
          <ulink url="&url.libxml2;">libxml2</ulink> in directory

-         <replaceable>prefix</replaceable>. 
+         <replaceable>prefix</replaceable>.

          Use this option if you want &yaz; to use XML and support SRU.
          By default, configure will
          search for libxml2 on the system. Use this option if it
          Use this option if you want &yaz; to use XML and support SRU.
          By default, configure will
          search for libxml2 on the system. Use this option if it

-         libxml2 is not found automatically. Alternatively, 
+         libxml2 is not found automatically. Alternatively,

          <literal>--without-xml2</literal>, can be used to force &yaz;
         not to use libxml2.
         </para>
          <literal>--without-xml2</literal>, can be used to force &yaz;
         not to use libxml2.
         </para>

@@ -316,7 +316,7 @@
       <varlistentry><term>
         <literal>--with-icu</literal>[=<replaceable>prefix</replaceable>]
        </term>
       <varlistentry><term>
         <literal>--with-icu</literal>[=<replaceable>prefix</replaceable>]
        </term>

-       <listitem><para>&yaz; will be linked the 
+       <listitem><para>&yaz; will be linked the

        <ulink url="&url.icu;">ICU</ulink> library in the prefix if given.
        If prefix is not given, the libraries exposed by the script
        <application>icu-config</application> will be used if found.
        <ulink url="&url.icu;">ICU</ulink> library in the prefix if given.
        If prefix is not given, the libraries exposed by the script
        <application>icu-config</application> will be used if found.

@@ -324,7 +324,7 @@
       </varlistentry>
 
      </variablelist>
       </varlistentry>
 
      </variablelist>

-     
+

     </para>
     <para>
      When configured, build the software by typing:
     </para>
     <para>
      When configured, build the software by typing:

@@ -332,7 +332,7 @@
       make
      </screen>
     </para>
       make
      </screen>
     </para>

-    
+

     <para>
      The following files are generated by the make process:
      <variablelist>
     <para>
      The following files are generated by the make process:
      <variablelist>

@@ -340,11 +340,11 @@
        <listitem><para>
          Main &yaz; library. This is no ordinary library. It's
          a Libtool archive.
        <listitem><para>
          Main &yaz; library. This is no ordinary library. It's
          a Libtool archive.

-         By default, &yaz; creates a static library in 
+         By default, &yaz; creates a static library in

          <filename>lib/.libs/libyaz.a</filename>.
         </para></listitem>
       </varlistentry>
          <filename>lib/.libs/libyaz.a</filename>.
         </para></listitem>
       </varlistentry>

-      
+

       <varlistentry><term><filename>src/libyaz_server.la</filename></term>
        <listitem><para>
          Generic Frontend server. This is an add-on for libyaz.la.
       <varlistentry><term><filename>src/libyaz_server.la</filename></term>
        <listitem><para>
          Generic Frontend server. This is an add-on for libyaz.la.

@@ -352,18 +352,18 @@
          threads are available on the platform.
         </para></listitem>
       </varlistentry>
          threads are available on the platform.
         </para></listitem>
       </varlistentry>

-      
+

       <varlistentry><term><filename>src/libyaz_icu.la</filename></term>
        <listitem><para>
          Functions that wrap the ICU library.
         </para></listitem>
       </varlistentry>
       <varlistentry><term><filename>src/libyaz_icu.la</filename></term>
        <listitem><para>
          Functions that wrap the ICU library.
         </para></listitem>
       </varlistentry>

-      
+

       <varlistentry><term><filename>ztest/yaz-ztest</filename></term>
       <varlistentry><term><filename>ztest/yaz-ztest</filename></term>

-       <listitem><para>Test Z39.50 server. 
+       <listitem><para>Test Z39.50 server.

         </para></listitem>
       </varlistentry>
         </para></listitem>
       </varlistentry>

-      
+

       <varlistentry><term><filename>client/yaz-client</filename></term>
        <listitem><para>Z39.50 client for testing the protocol.
          See chapter <link linkend="yaz-client">
       <varlistentry><term><filename>client/yaz-client</filename></term>
        <listitem><para>Z39.50 client for testing the protocol.
          See chapter <link linkend="yaz-client">

@@ -377,78 +377,78 @@
          &yaz;.
         </para></listitem>
       </varlistentry>
          &yaz;.
         </para></listitem>
       </varlistentry>

-      
+

       <varlistentry><term><filename>util/yaz-asncomp</filename></term>
        <listitem><para>The ASN.1 compiler for &yaz;. Requires the
          Tcl Shell, <application>tclsh</application>, in
          <literal>PATH</literal> to operate.
         </para></listitem>
       </varlistentry>
       <varlistentry><term><filename>util/yaz-asncomp</filename></term>
        <listitem><para>The ASN.1 compiler for &yaz;. Requires the
          Tcl Shell, <application>tclsh</application>, in
          <literal>PATH</literal> to operate.
         </para></listitem>
       </varlistentry>

-      
+

       <varlistentry><term><filename>util/yaz-iconv</filename></term>
        <listitem><para>This program converts data in one character set to
         another. This command exercises the YAZ character set
         conversion API.
         </para></listitem>
       </varlistentry>
       <varlistentry><term><filename>util/yaz-iconv</filename></term>
        <listitem><para>This program converts data in one character set to
         another. This command exercises the YAZ character set
         conversion API.
         </para></listitem>
       </varlistentry>

-       
+

       <varlistentry><term><filename>util/yaz-marcdump</filename></term>
        <listitem><para>This program parses ISO2709 encoded MARC records
         and prints them in line-format or XML.
         </para></listitem>
       </varlistentry>
       <varlistentry><term><filename>util/yaz-marcdump</filename></term>
        <listitem><para>This program parses ISO2709 encoded MARC records
         and prints them in line-format or XML.
         </para></listitem>
       </varlistentry>

-      
+

       <varlistentry><term><filename>util/yaz-icu</filename></term>
        <listitem><para>This program exposes the ICU wrapper library if that
         is enabled for YAZ. Only if ICU is available this program is
          useful.
         </para></listitem>
       </varlistentry>
       <varlistentry><term><filename>util/yaz-icu</filename></term>
        <listitem><para>This program exposes the ICU wrapper library if that
         is enabled for YAZ. Only if ICU is available this program is
          useful.
         </para></listitem>
       </varlistentry>

-      
+

      <varlistentry><term><filename>zoom/zoomsh</filename></term>
        <listitem><para>
      <varlistentry><term><filename>zoom/zoomsh</filename></term>
        <listitem><para>

-         A simple shell implemented on top of the 
+         A simple shell implemented on top of the

          <link linkend="zoom">ZOOM</link> functions.
          The shell is a command line application that allows you to enter
          simple commands to perform ZOOM operations.
         </para></listitem>
       </varlistentry>
          <link linkend="zoom">ZOOM</link> functions.
          The shell is a command line application that allows you to enter
          simple commands to perform ZOOM operations.
         </para></listitem>
       </varlistentry>

-      
-      <varlistentry><term><filename>zoom/zoomtst1</filename>, 
+
+      <varlistentry><term><filename>zoom/zoomtst1</filename>,

         <filename>zoom/zoomtst2</filename>, ..</term>
        <listitem><para>
          Several small applications that demonstrates the ZOOM API.
         </para></listitem>
       </varlistentry>
      </variablelist>
         <filename>zoom/zoomtst2</filename>, ..</term>
        <listitem><para>
          Several small applications that demonstrates the ZOOM API.
         </para></listitem>
       </varlistentry>
      </variablelist>

-     
+

     </para>
     </para>

-    
+

     <para>
     <para>

-     If you wish to install &yaz; in system directories  
+     If you wish to install &yaz; in system directories

      <filename>/usr/local/bin</filename>,
      <filename>/usr/local/lib</filename> .. etc, you can type:
     </para>
      <filename>/usr/local/bin</filename>,
      <filename>/usr/local/lib</filename> .. etc, you can type:
     </para>

-    
+

     <screen>
      make install
     </screen>
     <screen>
      make install
     </screen>

-   
+

     <para>
      You probably need to have root access in order to perform this.
      You must specify the <literal>--prefix</literal> option for configure if
     <para>
      You probably need to have root access in order to perform this.
      You must specify the <literal>--prefix</literal> option for configure if

-     you wish to install &yaz; in other directories than the default 
+     you wish to install &yaz; in other directories than the default

      <filename>/usr/local/</filename>.
     </para>
      <filename>/usr/local/</filename>.
     </para>

-    
+

     <para>
      If you wish to perform an un-installation of &yaz;, use:
     </para>
     <para>
      If you wish to perform an un-installation of &yaz;, use:
     </para>

-    
+

     <screen>
      make uninstall
     </screen>
     <screen>
      make uninstall
     </screen>

-    
+

     <para>
      This will only work if you haven't reconfigured &yaz; (and therefore
      changed installation prefix). Note that uninstall will not
     <para>
      This will only work if you haven't reconfigured &yaz; (and therefore
      changed installation prefix). Note that uninstall will not

@@ -505,7 +505,7 @@
      <screen>
       #include &lt;proto.h>
      </screen>
      <screen>
       #include &lt;proto.h>
      </screen>

-    </para> 
+    </para>

     <para>
      For Libtool users, the <filename>yaz-config</filename> script provides
      a different variant of option <literal>--libs</literal>, called
     <para>
      For Libtool users, the <filename>yaz-config</filename> script provides
      a different variant of option <literal>--libs</literal>, called

@@ -531,14 +531,14 @@
    </sect2>
   </sect1>
   <sect1 id="installation.win32"><title>WIN32</title>
    </sect2>
   </sect1>
   <sect1 id="installation.win32"><title>WIN32</title>

-   
+

    <para>The easiest way to install YAZ on Windows is by downloading
    <para>The easiest way to install YAZ on Windows is by downloading

-    an installer from 
+    an installer from

     <ulink url="&url.yaz.download.win32;">here</ulink>.
     The installer comes with source too - in case you wish to
     <ulink url="&url.yaz.download.win32;">here</ulink>.
     The installer comes with source too - in case you wish to

-    compile YAZ with different Compiler options etc. 
+    compile YAZ with different Compiler options etc.

    </para>
    </para>

-   
+

    <sect2 id="installation.win32.source">
     <title>Compiling from Source on WIN32</title>
     <para>
    <sect2 id="installation.win32.source">
     <title>Compiling from Source on WIN32</title>
     <para>

@@ -553,9 +553,9 @@
      <filename>WIN</filename> where the file <filename>makefile</filename>
      is located. Customize the installation by editing the
      <filename>makefile</filename> file (for example by using notepad).
      <filename>WIN</filename> where the file <filename>makefile</filename>
      is located. Customize the installation by editing the
      <filename>makefile</filename> file (for example by using notepad).

-     
+

      The following summarizes the most important settings in that file:
      The following summarizes the most important settings in that file:

-     
+

      <variablelist>
       <varlistentry><term><literal>DEBUG</literal></term>
        <listitem><para>
      <variablelist>
       <varlistentry><term><literal>DEBUG</literal></term>
        <listitem><para>

@@ -591,7 +591,7 @@
          (<filename>cql.y</filename>).
         </para>
         <para>
          (<filename>cql.y</filename>).
         </para>
         <para>

-         A Windows version of GNU Bison is part of 
+         A Windows version of GNU Bison is part of

          <ulink url="&url.unxutils;">unxutils</ulink>.
         </para></listitem>
       </varlistentry>
          <ulink url="&url.unxutils;">unxutils</ulink>.
         </para></listitem>
       </varlistentry>

@@ -601,19 +601,19 @@
         <literal>ICONV_DIR</literal></term>
        <listitem><para>
          If <literal>HAVE_ICONV</literal> is set to 1, YAZ is compiled
         <literal>ICONV_DIR</literal></term>
        <listitem><para>
          If <literal>HAVE_ICONV</literal> is set to 1, YAZ is compiled

-         with iconv support. In this configuration, set 
+         with iconv support. In this configuration, set

          <literal>ICONV_DIR</literal> to the iconv source directory.
         </para></listitem>
       </varlistentry>
          <literal>ICONV_DIR</literal> to the iconv source directory.
         </para></listitem>
       </varlistentry>

-      
+

       <varlistentry>
        <term><literal>HAVE_LIBXML2</literal>,
         <literal>LIBXML2_DIR</literal></term>
        <listitem>
         <para>
          If <literal>HAVE_LIBXML2</literal> is set to 1, YAZ is compiled
       <varlistentry>
        <term><literal>HAVE_LIBXML2</literal>,
         <literal>LIBXML2_DIR</literal></term>
        <listitem>
         <para>
          If <literal>HAVE_LIBXML2</literal> is set to 1, YAZ is compiled

-         with SRU support. In this configuration, set 
-         <literal>LIBXML2_DIR</literal> to the 
+         with SRU support. In this configuration, set
+         <literal>LIBXML2_DIR</literal> to the

          <ulink url="&url.libxml2;">libxml2</ulink> source directory
         and
         <literal>ZLIB_DIR</literal> to the zlib directory.
          <ulink url="&url.libxml2;">libxml2</ulink> source directory
         and
         <literal>ZLIB_DIR</literal> to the zlib directory.

@@ -639,8 +639,8 @@
        <listitem>
         <para>
          If <literal>HAVE_LIBXSLT</literal> is set to 1, YAZ is compiled
        <listitem>
         <para>
          If <literal>HAVE_LIBXSLT</literal> is set to 1, YAZ is compiled

-         with XSLT support. In this configuration, set 
-         <literal>LIBXSLT_DIR</literal> to the 
+         with XSLT support. In this configuration, set
+         <literal>LIBXSLT_DIR</literal> to the

          <ulink url="&url.libxslt;">libxslt</ulink> source directory.
         </para>
 
          <ulink url="&url.libxslt;">libxslt</ulink> source directory.
         </para>
 

@@ -659,8 +659,8 @@
         <para>
          If <literal>HAVE_ICU</literal> is set to 1, YAZ is compiled
          with <ulink url="&url.icu;">ICU</ulink> support.
         <para>
          If <literal>HAVE_ICU</literal> is set to 1, YAZ is compiled
          with <ulink url="&url.icu;">ICU</ulink> support.

-        In this configuration, set 
-         <literal>ICU_DIR</literal> to the 
+        In this configuration, set
+         <literal>ICU_DIR</literal> to the

          <ulink url="&url.icu;">ICU</ulink> source directory.
         </para>
        </listitem>
          <ulink url="&url.icu;">ICU</ulink> source directory.
         </para>
        </listitem>

@@ -695,61 +695,61 @@
     </para>
     <para>
      The following files are generated upon successful compilation:
     </para>
     <para>
      The following files are generated upon successful compilation:

-     
+

      <variablelist>
      <variablelist>

-      <varlistentry><term><filename>bin/yaz4.dll</filename> / 
+      <varlistentry><term><filename>bin/yaz4.dll</filename> /

          <filename>bin/yaz4d.dll</filename></term>
        <listitem><para>
          &yaz; Release/Debug DLL.
         </para></listitem></varlistentry>
          <filename>bin/yaz4d.dll</filename></term>
        <listitem><para>
          &yaz; Release/Debug DLL.
         </para></listitem></varlistentry>

-      
-      <varlistentry><term><filename>lib/yaz4.lib</filename> / 
+
+      <varlistentry><term><filename>lib/yaz4.lib</filename> /

          <filename>lib/yaz4d.lib</filename></term>
        <listitem><para>
          Import library for <filename>yaz4.dll</filename> /
         <filename>yaz4d.dll</filename>.
         </para></listitem></varlistentry>
          <filename>lib/yaz4d.lib</filename></term>
        <listitem><para>
          Import library for <filename>yaz4.dll</filename> /
         <filename>yaz4d.dll</filename>.
         </para></listitem></varlistentry>

-      
-      <varlistentry><term><filename>bin/yaz_cond4.dll</filename> / 
+
+      <varlistentry><term><filename>bin/yaz_cond4.dll</filename> /

          <filename>bin/yaz_cond4d.dll</filename></term>
        <listitem><para>
         Release/Debug DLL for condition variable utilities (condvar.c).
         </para></listitem></varlistentry>
          <filename>bin/yaz_cond4d.dll</filename></term>
        <listitem><para>
         Release/Debug DLL for condition variable utilities (condvar.c).
         </para></listitem></varlistentry>

-      
-      <varlistentry><term><filename>lib/yaz_cond4.lib</filename> / 
+
+      <varlistentry><term><filename>lib/yaz_cond4.lib</filename> /

          <filename>lib/yaz_cond4d.lib</filename></term>
        <listitem><para>
          Import library for <filename>yaz_cond4.dll</filename> /
         <filename>yaz_cond4d.dll</filename>.
         </para></listitem></varlistentry>
          <filename>lib/yaz_cond4d.lib</filename></term>
        <listitem><para>
          Import library for <filename>yaz_cond4.dll</filename> /
         <filename>yaz_cond4d.dll</filename>.
         </para></listitem></varlistentry>

-      
+

       <varlistentry><term><filename>bin/yaz_icu4.dll</filename> /
           <filename>bin/yaz_icu4d.dll</filename></term>
        <listitem><para>
          Release/Debug DLL for the ICU wrapper utility.
         Only build if HAVE_ICU is 1.
         </para></listitem></varlistentry>
       <varlistentry><term><filename>bin/yaz_icu4.dll</filename> /
           <filename>bin/yaz_icu4d.dll</filename></term>
        <listitem><para>
          Release/Debug DLL for the ICU wrapper utility.
         Only build if HAVE_ICU is 1.
         </para></listitem></varlistentry>

-      
+

       <varlistentry><term><filename>lib/yaz_icu4.lib</filename> /
          <filename>lib/yaz_icu4d.lib</filename></term>
        <listitem><para>
          Import library for <filename>yaz_icu4.dll</filename> /
         <filename>yaz_icu4d.dll</filename>.
         </para></listitem></varlistentry>
       <varlistentry><term><filename>lib/yaz_icu4.lib</filename> /
          <filename>lib/yaz_icu4d.lib</filename></term>
        <listitem><para>
          Import library for <filename>yaz_icu4.dll</filename> /
         <filename>yaz_icu4d.dll</filename>.
         </para></listitem></varlistentry>

-      
+

       <varlistentry><term><filename>bin/yaz-ztest.exe</filename></term>
        <listitem><para>
          Z39.50 multi-threaded test/example server. It's a WIN32
          console application.
         </para></listitem></varlistentry>
       <varlistentry><term><filename>bin/yaz-ztest.exe</filename></term>
        <listitem><para>
          Z39.50 multi-threaded test/example server. It's a WIN32
          console application.
         </para></listitem></varlistentry>

-      
+

       <varlistentry><term><filename>bin/yaz-client.exe</filename></term>
        <listitem><para>
          &yaz; Z39.50 client application. It's a WIN32 console application.
          See chapter <link linkend="yaz-client">YAZ client</link> for more
          information.
         </para></listitem></varlistentry>
       <varlistentry><term><filename>bin/yaz-client.exe</filename></term>
        <listitem><para>
          &yaz; Z39.50 client application. It's a WIN32 console application.
          See chapter <link linkend="yaz-client">YAZ client</link> for more
          information.
         </para></listitem></varlistentry>

-      
+

       <varlistentry><term><filename>bin/yaz-icu.exe</filename></term>
        <listitem><para>This program exposes the ICU wrapper library if that
         is enabled for YAZ. Only if ICU is available this program is
       <varlistentry><term><filename>bin/yaz-icu.exe</filename></term>
        <listitem><para>This program exposes the ICU wrapper library if that
         is enabled for YAZ. Only if ICU is available this program is

@@ -763,15 +763,15 @@
          The application is a command line shell that allows you to enter
          simple commands to perform ZOOM operations.
         </para></listitem></varlistentry>
          The application is a command line shell that allows you to enter
          simple commands to perform ZOOM operations.
         </para></listitem></varlistentry>

-      
-      <varlistentry><term><filename>bin/zoomtst1.exe</filename>, 
+
+      <varlistentry><term><filename>bin/zoomtst1.exe</filename>,

         <filename>bin/zoomtst2.exe</filename>, ..</term>
        <listitem><para>
          Several small applications that demonstrates the ZOOM API.
         </para></listitem></varlistentry>
         <filename>bin/zoomtst2.exe</filename>, ..</term>
        <listitem><para>
          Several small applications that demonstrates the ZOOM API.
         </para></listitem></varlistentry>

-      
+

      </variablelist>
      </variablelist>

-     
+

     </para>
    </sect2>
 
     </para>
    </sect2>
 

@@ -796,7 +796,7 @@
         </para></listitem></varlistentry>
       <varlistentry><term>import library <filename>yaz4.lib</filename>
        </term><listitem><para>
         </para></listitem></varlistentry>
       <varlistentry><term>import library <filename>yaz4.lib</filename>
        </term><listitem><para>

-         You must link with this library. It's located in the 
+         You must link with this library. It's located in the

          sub directory <filename>lib</filename> of &yaz;.
         If you want to link with the debug version of &yaz;, you must
         link against <filename>yaz4d.lib</filename> instead.
          sub directory <filename>lib</filename> of &yaz;.
         If you want to link with the debug version of &yaz;, you must
         link against <filename>yaz4d.lib</filename> instead.

@@ -812,7 +812,7 @@
    </sect2>
   </sect1>
  </chapter>
    </sect2>
   </sect1>
  </chapter>

- 
+

  <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml
  <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml

@@ -827,4 +827,4 @@
  sgml-namecase-general:t
  End:
  -->
  sgml-namecase-general:t
  End:
  -->

- 
+

diff --git a/doc/introduction.xml b/doc/introduction.xml
index fc9a628..7b2baae 100644 (file)
--- a/doc/introduction.xml
+++ b/doc/introduction.xml
@@ -4,33 +4,33 @@
    &yaz; is a C/C++ library for information retrieval applications
    using the Z39.50/SRU/SOLR protocols for information retrieval.
   </para>
    &yaz; is a C/C++ library for information retrieval applications
    using the Z39.50/SRU/SOLR protocols for information retrieval.
   </para>

-  
+

   <para>
    Properties of &yaz;:
    <itemizedlist>
     <listitem><para>
   <para>
    Properties of &yaz;:
    <itemizedlist>
     <listitem><para>

-      Complete 
+      Complete

       <ulink url="&url.z39.50;">Z39.50</ulink> version 3 support.
       Amendments and Z39.50-2002 revision is supported.
      </para></listitem>
     <listitem><para>
       <ulink url="&url.z39.50;">Z39.50</ulink> version 3 support.
       Amendments and Z39.50-2002 revision is supported.
      </para></listitem>
     <listitem><para>

-      Supports 
+      Supports

       <ulink url="&url.sru;">SRU GET/POST/SOAP</ulink>
       version 1.2 (over HTTP and HTTPS).
      </para></listitem>
     <listitem><para>
       <ulink url="&url.sru;">SRU GET/POST/SOAP</ulink>
       version 1.2 (over HTTP and HTTPS).
      </para></listitem>
     <listitem><para>

-      Includes BER encoders/decoders for the 
+      Includes BER encoders/decoders for the

       <ulink url="&url.ill;">ISO ILL</ulink>
       protocol.
      </para></listitem>
     <listitem><para>
       <ulink url="&url.ill;">ISO ILL</ulink>
       protocol.
      </para></listitem>
     <listitem><para>

-      Supports 
+      Supports

       <ulink url="&url.solr;">SOLR</ulink> Web Service version 1.4.x (client side only)
      </para></listitem>
     <listitem><para>
       Supports the following transports: BER over TCP/IP
       (<ulink url="&url.ber.over.tcpip;">RFC1729</ulink>),
       <ulink url="&url.solr;">SOLR</ulink> Web Service version 1.4.x (client side only)
      </para></listitem>
     <listitem><para>
       Supports the following transports: BER over TCP/IP
       (<ulink url="&url.ber.over.tcpip;">RFC1729</ulink>),

-      BER over unix local socket, and 
+      BER over unix local socket, and

       <ulink url="&url.http.1.1;">HTTP 1.1</ulink>.
      </para></listitem>
     <listitem><para>
       <ulink url="&url.http.1.1;">HTTP 1.1</ulink>.
      </para></listitem>
     <listitem><para>

@@ -41,14 +41,14 @@
       "Secure BER" (for Z39.50).
      </para></listitem>
     <listitem><para>
       "Secure BER" (for Z39.50).
      </para></listitem>
     <listitem><para>

-      Offers 
+      Offers

       <ulink url="&url.zoom;">ZOOM</ulink> C API implementing
       Z39.50, SRU and SOLR Web Service.
      </para></listitem>
     <listitem><para>
       The &yaz; library offers a set of useful utilities
       related to the protocols, such as MARC (ISO2709) parser,
       <ulink url="&url.zoom;">ZOOM</ulink> C API implementing
       Z39.50, SRU and SOLR Web Service.
      </para></listitem>
     <listitem><para>
       The &yaz; library offers a set of useful utilities
       related to the protocols, such as MARC (ISO2709) parser,

-      CCL (ISO8777) parser, 
+      CCL (ISO8777) parser,

       <ulink url="&url.cql;">CQL</ulink>
       parser, memory management routines, character set conversion.
      </para></listitem>
       <ulink url="&url.cql;">CQL</ulink>
       parser, memory management routines, character set conversion.
      </para></listitem>

@@ -74,7 +74,7 @@
    <itemizedlist>
     <listitem>
      <para>
    <itemizedlist>
     <listitem>
      <para>

-      <xref linkend="installation"/> contains installation 
+      <xref linkend="installation"/> contains installation

       instructions for &yaz;. You don't need reading this
       if you expect to download &yaz; binaries.
       However, the chapter contains information about how
       instructions for &yaz;. You don't need reading this
       if you expect to download &yaz; binaries.
       However, the chapter contains information about how

@@ -90,7 +90,7 @@
       client.
      </para>
     </listitem>
       client.
      </para>
     </listitem>

-    
+

     <listitem>
      <para>
       <xref linkend="server"/> describes the generic frontend server
     <listitem>
      <para>
       <xref linkend="server"/> describes the generic frontend server

@@ -118,7 +118,7 @@
 
     <listitem>
      <para>
 
     <listitem>
      <para>

-      <xref linkend="soap"/> describes how SRU and SOAP is used 
+      <xref linkend="soap"/> describes how SRU and SOAP is used

       in &yaz;. Only if you're developing SRU applications
       this section is a must.
      </para>
       in &yaz;. Only if you're developing SRU applications
       this section is a must.
      </para>

@@ -158,7 +158,7 @@
    </itemizedlist>
   </sect1>
   <sect1 id="introduction.api"><title>The API</title>
    </itemizedlist>
   </sect1>
   <sect1 id="introduction.api"><title>The API</title>

-   
+

    <para>
     The <ulink url="&url.yaz;">&yaz;</ulink>
     toolkit offers several different levels of access to the
    <para>
     The <ulink url="&url.yaz;">&yaz;</ulink>
     toolkit offers several different levels of access to the

@@ -171,7 +171,7 @@
     If you're developing a client application you should consider the
     <link linkend="zoom">ZOOM</link> API.
     It is, by far, the easiest way to develop clients in C.
     If you're developing a client application you should consider the
     <link linkend="zoom">ZOOM</link> API.
     It is, by far, the easiest way to develop clients in C.

-    Server implementers should consider the 
+    Server implementers should consider the

     <link linkend="server">generic frontend server</link>.
     None of those high-level APIs support the whole protocol, but
     they do include most facilities used in existing Z39.50 applications.
     <link linkend="server">generic frontend server</link>.
     None of those high-level APIs support the whole protocol, but
     they do include most facilities used in existing Z39.50 applications.

@@ -206,7 +206,7 @@
      </listitem>
      <listitem>
       <para>
      </listitem>
      <listitem>
       <para>

-       The second layer provides a C represenation of the 
+       The second layer provides a C represenation of the

        protocol units (packages) for Z39.50 ASN.1, ILL ASN.1,
        SRU.
       </para>
        protocol units (packages) for Z39.50 ASN.1, ILL ASN.1,
        SRU.
       </para>

@@ -251,7 +251,7 @@
     The &asn; library also provides functions (which are, in turn,
     defined using &odr; primitives) for encoding and decoding data values.
     Their general form is
     The &asn; library also provides functions (which are, in turn,
     defined using &odr; primitives) for encoding and decoding data values.
     Their general form is

-    
+

     <funcsynopsis>
      <funcprototype><funcdef>int <function>z_<replaceable>xxx</replaceable></function></funcdef>
       <paramdef>ODR <parameter>o</parameter></paramdef>
     <funcsynopsis>
      <funcprototype><funcdef>int <function>z_<replaceable>xxx</replaceable></function></funcdef>
       <paramdef>ODR <parameter>o</parameter></paramdef>

@@ -262,7 +262,7 @@
     </funcsynopsis>
     (note the lower-case &quot;z&quot; in the function name)
    </para>
     </funcsynopsis>
     (note the lower-case &quot;z&quot; in the function name)
    </para>

-   
+

    <note>
     <para>
      If you are using the premade definitions of the &asn; module, and you
    <note>
     <para>
      If you are using the premade definitions of the &asn; module, and you

@@ -271,7 +271,7 @@
      <xref linkend="odr.use"/>.
     </para>
    </note>
      <xref linkend="odr.use"/>.
     </para>
    </note>

-   
+

   <para>
     When you have created a BER-encoded buffer, you can use the &comstack;
     subsystem to transmit (or receive) data over the network. The &comstack;
   <para>
     When you have created a BER-encoded buffer, you can use the &comstack;
     subsystem to transmit (or receive) data over the network. The &comstack;

diff --git a/doc/license.xml b/doc/license.xml
index 188b64f..1505799 100644 (file)
--- a/doc/license.xml
+++ b/doc/license.xml
@@ -36,7 +36,7 @@
       </para>
     </listitem>
    </itemizedlist>
       </para>
     </listitem>
    </itemizedlist>

-   
+

    <para>
     THIS SOFTWARE IS PROVIDED BY INDEX DATA ``AS IS'' AND ANY
     EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
    <para>
     THIS SOFTWARE IS PROVIDED BY INDEX DATA ``AS IS'' AND ANY
     EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

diff --git a/doc/odr.xml b/doc/odr.xml
index 45f8326..770ad9c 100644 (file)
--- a/doc/odr.xml
+++ b/doc/odr.xml
@@ -1,5 +1,5 @@
  <chapter id="odr"><title>The ODR Module</title>
  <chapter id="odr"><title>The ODR Module</title>

-  
+

   <sect1 id="odr.introduction"><title>Introduction</title>
 
    <para>
   <sect1 id="odr.introduction"><title>Introduction</title>
 
    <para>

@@ -258,12 +258,12 @@
      data you wish to decode (eg, <function>odr_integer()</function> odr
      <function>z_APDU()</function>).
     </para>
      data you wish to decode (eg, <function>odr_integer()</function> odr
      <function>z_APDU()</function>).
     </para>

-    
+

     <example id="example.odr.encoding.and.decoding.functions">
      <title>Encoding and decoding functions</title>
      <synopsis>
       int odr_integer(ODR o, Odr_int **p, int optional, const char *name);
     <example id="example.odr.encoding.and.decoding.functions">
      <title>Encoding and decoding functions</title>
      <synopsis>
       int odr_integer(ODR o, Odr_int **p, int optional, const char *name);

-      
+

       int z_APDU(ODR o, Z_APDU **p, int optional, const char *name);
      </synopsis>
     </example>
       int z_APDU(ODR o, Z_APDU **p, int optional, const char *name);
      </synopsis>
     </example>

@@ -293,7 +293,7 @@
      <function>free(2)</function> to release the memory.
      You can decode several data elements (by repeated calls to
      <function>odr_setbuf()</function> and your decoding function), and
      <function>free(2)</function> to release the memory.
      You can decode several data elements (by repeated calls to
      <function>odr_setbuf()</function> and your decoding function), and

-     new memory will be allocated each time. When you do call 
+     new memory will be allocated each time. When you do call

      <function>odr_reset()</function>, everything decoded since the
      last call to <function>odr_reset()</function> will be released.
     </para>
      <function>odr_reset()</function>, everything decoded since the
      last call to <function>odr_reset()</function> will be released.
     </para>

@@ -314,7 +314,7 @@ void do_nothing_useful(Odr_int value)
     Odr_int *valp, *resvalp;
     char *bufferp;
     int len;
     Odr_int *valp, *resvalp;
     char *bufferp;
     int len;

-     
+

     /* allocate streams */
     if (!(encode = odr_createmem(ODR_ENCODE)))
         return;
     /* allocate streams */
     if (!(encode = odr_createmem(ODR_ENCODE)))
         return;

@@ -354,7 +354,7 @@ void do_nothing_useful(Odr_int value)
       program, so the overhead is quite manageable.
      </para>
     </example>
       program, so the overhead is quite manageable.
      </para>
     </example>

-    
+

    </sect2>
 
    <sect2 id="odr.printing"><title>Printing</title>
    </sect2>
 
    <sect2 id="odr.printing"><title>Printing</title>

@@ -378,11 +378,11 @@ void do_nothing_useful(Odr_int value)
      Here the user provides an opaque handle and two handlers,
      <replaceable>stream_write</replaceable> for writing,
      and <replaceable>stream_close</replaceable> which is supposed
      Here the user provides an opaque handle and two handlers,
      <replaceable>stream_write</replaceable> for writing,
      and <replaceable>stream_close</replaceable> which is supposed

-     to close/free resources associated with handle. 
+     to close/free resources associated with handle.

      The <replaceable>stream_close</replaceable> handler is optional and
      if NULL for the function is provided, it will not be invoked.
      The <replaceable>stream_write</replaceable> takes the ODR handle
      The <replaceable>stream_close</replaceable> handler is optional and
      if NULL for the function is provided, it will not be invoked.
      The <replaceable>stream_write</replaceable> takes the ODR handle

-     as parameter, the user defined handle, a type 
+     as parameter, the user defined handle, a type

      <literal>ODR_OCTETSTRING</literal>, <literal>ODR_VISIBLESTRING</literal>
      which indicates the type of contents is being written.
     </para>
      <literal>ODR_OCTETSTRING</literal>, <literal>ODR_VISIBLESTRING</literal>
      which indicates the type of contents is being written.
     </para>

@@ -392,8 +392,8 @@ void do_nothing_useful(Odr_int value)
      <synopsis>
       const char **odr_get_element_path(ODR o);
      </synopsis>
      <synopsis>
       const char **odr_get_element_path(ODR o);
      </synopsis>

-     which returns a list of current elements that ODR deals with at the 
-     moment. For the returned array, say <literal>ar</literal>, 
+     which returns a list of current elements that ODR deals with at the
+     moment. For the returned array, say <literal>ar</literal>,

      <literal>ar[0]</literal> is the top level element,
      <literal>ar[n]</literal> is the last. The last element has the
      property that <literal>ar[n+1] == NULL</literal>.
      <literal>ar[0]</literal> is the top level element,
      <literal>ar[n]</literal> is the last. The last element has the
      property that <literal>ar[n+1] == NULL</literal>.

@@ -403,7 +403,7 @@ void do_nothing_useful(Odr_int value)
      <para>
       For a database record part of a PresentResponse the
       array returned by <function>odr_get_element</function>
      <para>
       For a database record part of a PresentResponse the
       array returned by <function>odr_get_element</function>

-      is <literal>presentResponse</literal>, <literal>databaseOrSurDiagnostics</literal>, <literal>?</literal>, <literal>record</literal>, <literal>?</literal>, <literal>databaseRecord</literal> . The question mark appears due to 
+      is <literal>presentResponse</literal>, <literal>databaseOrSurDiagnostics</literal>, <literal>?</literal>, <literal>record</literal>, <literal>?</literal>, <literal>databaseRecord</literal> . The question mark appears due to

       unnamed constructions.
      </para>
      </example>
       unnamed constructions.
      </para>
      </example>

@@ -543,11 +543,11 @@ void do_nothing_useful(Odr_int value)
     <para>
      There is an ASN.1 tutorial available at
      <ulink url="&url.asn.1.tutorial;">this site</ulink>.
     <para>
      There is an ASN.1 tutorial available at
      <ulink url="&url.asn.1.tutorial;">this site</ulink>.

-     This site also has standards for ASN.1 (X.680) and BER (X.690) 
+     This site also has standards for ASN.1 (X.680) and BER (X.690)

      <ulink url="&url.asn.1.standards;">online</ulink>.
     </para>
    </tip>
      <ulink url="&url.asn.1.standards;">online</ulink>.
     </para>
    </tip>

-   
+

    <para>
     The ODR interface is based loosely on that of the Sun Microsystems
     XDR routines.
    <para>
     The ODR interface is based loosely on that of the Sun Microsystems
     XDR routines.

@@ -560,9 +560,9 @@ void do_nothing_useful(Odr_int value)
     definition for a type once - and you have the functionality of encoding,
     decoding (and pretty-printing) all in one unit.
     The resulting C source code is quite compact, and is a pretty
     definition for a type once - and you have the functionality of encoding,
     decoding (and pretty-printing) all in one unit.
     The resulting C source code is quite compact, and is a pretty

-    straightforward representation of the source ASN.1 specification. 
+    straightforward representation of the source ASN.1 specification.

    </para>
    </para>

-   
+

    <para>
     In many cases, the model of the XDR functions works quite well in this
     role.
    <para>
     In many cases, the model of the XDR functions works quite well in this
     role.

@@ -592,7 +592,7 @@ void do_nothing_useful(Odr_int value)
      <para>
       The <literal>Odr_int</literal> is just a simple integer.
      </para>
      <para>
       The <literal>Odr_int</literal> is just a simple integer.
      </para>

-     
+

      <para>
       This form is typical of the primitive &odr; functions. They are named
       after the type of data that they encode or decode. They take an &odr;
      <para>
       This form is typical of the primitive &odr; functions. They are named
       after the type of data that they encode or decode. They take an &odr;

@@ -769,7 +769,7 @@ int odr_oid(ODR o, Odr_oid **p, int optional, const char *name);
 
     <para>
      The simplest way of tagging a type is to use the
 
     <para>
      The simplest way of tagging a type is to use the

-     <function>odr_implicit_tag()</function> or 
+     <function>odr_implicit_tag()</function> or

      <function>odr_explicit_tag()</function> macros:
     </para>
 
      <function>odr_explicit_tag()</function> macros:
     </para>
 

@@ -870,7 +870,7 @@ typedef struct MySequence
     Odr_int *intval;
     Odr_bool *boolval;
 } MySequence;
     Odr_int *intval;
     Odr_bool *boolval;
 } MySequence;

-     
+

 int mySequence(ODR o, MySequence **p, int optional, const char *name)
 {
     if (odr_sequence_begin(o, p, sizeof(**p), name) == 0)
 int mySequence(ODR o, MySequence **p, int optional, const char *name)
 {
     if (odr_sequence_begin(o, p, sizeof(**p), name) == 0)

diff --git a/doc/server.xml b/doc/server.xml
index 02557e2..b4b0fbe 100644 (file)
--- a/doc/server.xml
+++ b/doc/server.xml
@@ -1,6 +1,6 @@
  <chapter id="server"><title>Generic server</title>
   <sect1 id="server.introduction"><title>Introduction</title>
  <chapter id="server"><title>Generic server</title>
   <sect1 id="server.introduction"><title>Introduction</title>

-   
+

    <para>
     If you aren't into documentation, a good way to learn how the
     back end interface works is to look at the <filename>backend.h</filename>
    <para>
     If you aren't into documentation, a good way to learn how the
     back end interface works is to look at the <filename>backend.h</filename>

@@ -47,7 +47,7 @@
      </para>
    </note>
   </sect1>
      </para>
    </note>
   </sect1>

-  
+

   <sect1 id="server.frontend"><title>The Database Frontend</title>
 
    <para>
   <sect1 id="server.frontend"><title>The Database Frontend</title>
 
    <para>

@@ -89,7 +89,7 @@
     <listitem><para>
       Extended Services (optional).
      </para></listitem>
     <listitem><para>
       Extended Services (optional).
      </para></listitem>

-    
+

     <listitem><para>
       Result-Set Delete (optional).
      </para></listitem>
     <listitem><para>
       Result-Set Delete (optional).
      </para></listitem>

@@ -97,11 +97,11 @@
     <listitem><para>
       Result-Set Sort (optional).
      </para></listitem>
     <listitem><para>
       Result-Set Sort (optional).
      </para></listitem>

-    
+

     <listitem><para>
       Return Explain for SRU (optional).
      </para></listitem>
     <listitem><para>
       Return Explain for SRU (optional).
      </para></listitem>

-    
+

    </itemizedlist>
 
    <para>
    </itemizedlist>
 
    <para>

@@ -157,9 +157,9 @@ int statserv_main(int argc, char **argv,
     connection.
     If you do use global variables and forking, you should be aware, then,
     that these cannot be shared between associations, unless you explicitly
     connection.
     If you do use global variables and forking, you should be aware, then,
     that these cannot be shared between associations, unless you explicitly

-    disable forking by command line parameters. 
+    disable forking by command line parameters.

    </para>
    </para>

-   
+

    <para>
     The server provides a mechanism for controlling some of its behavior
     without using command-line options. The function
    <para>
     The server provides a mechanism for controlling some of its behavior
     without using command-line options. The function

@@ -173,7 +173,7 @@ int statserv_main(int argc, char **argv,
     will return a pointer to a <literal>struct statserv_options_block</literal>
     describing the current default settings of the server. The structure
     contains these elements:
     will return a pointer to a <literal>struct statserv_options_block</literal>
     describing the current default settings of the server. The structure
     contains these elements:

-    
+

     <variablelist>
      <varlistentry><term>
        <literal>int dynamic</literal></term><listitem><para>
     <variablelist>
      <varlistentry><term>
        <literal>int dynamic</literal></term><listitem><para>

@@ -182,7 +182,7 @@ int statserv_main(int argc, char **argv,
        TRUE. This flag is only read by UNIX-based servers (WIN32 based servers
        doesn't fork).
        </para></listitem></varlistentry>
        TRUE. This flag is only read by UNIX-based servers (WIN32 based servers
        doesn't fork).
        </para></listitem></varlistentry>

-     
+

      <varlistentry><term>
        <literal>int threads</literal></term><listitem><para>
        A boolean value, which determines whether the server
      <varlistentry><term>
        <literal>int threads</literal></term><listitem><para>
        A boolean value, which determines whether the server

@@ -191,18 +191,18 @@ int statserv_main(int argc, char **argv,
        that offer POSIX Threads support.
        WIN32-based servers always operate in threaded mode.
        </para></listitem></varlistentry>
        that offer POSIX Threads support.
        WIN32-based servers always operate in threaded mode.
        </para></listitem></varlistentry>

-     
+

      <varlistentry><term>
        <literal>int inetd</literal></term><listitem><para>
        A boolean value, which determines whether the server
        will operates under a UNIX INET daemon (inetd). Default is FALSE.
        </para></listitem></varlistentry>
      <varlistentry><term>
        <literal>int inetd</literal></term><listitem><para>
        A boolean value, which determines whether the server
        will operates under a UNIX INET daemon (inetd). Default is FALSE.
        </para></listitem></varlistentry>

-     
+

      <varlistentry><term>
        <literal>char logfile[ODR_MAXNAME+1]</literal></term>
       <listitem><para>File for diagnostic output (&quot;&quot;: stderr).
        </para></listitem></varlistentry>
      <varlistentry><term>
        <literal>char logfile[ODR_MAXNAME+1]</literal></term>
       <listitem><para>File for diagnostic output (&quot;&quot;: stderr).
        </para></listitem></varlistentry>

-     
+

      <varlistentry><term>
        <literal>char apdufile[ODR_MAXNAME+1]</literal></term>
       <listitem><para>
      <varlistentry><term>
        <literal>char apdufile[ODR_MAXNAME+1]</literal></term>
       <listitem><para>

@@ -225,13 +225,13 @@ int statserv_main(int argc, char **argv,
        <literal>PROTO_SR</literal>.
        Default is <literal>PROTO_Z39_50</literal>.
        </para></listitem></varlistentry>
        <literal>PROTO_SR</literal>.
        Default is <literal>PROTO_Z39_50</literal>.
        </para></listitem></varlistentry>

-     
+

      <varlistentry><term>
        <literal>int idle_timeout;</literal></term>
       <listitem><para>Maximum session idle-time, in minutes. Zero indicates
        no (infinite) timeout. Default is 15 minutes.
        </para></listitem></varlistentry>
      <varlistentry><term>
        <literal>int idle_timeout;</literal></term>
       <listitem><para>Maximum session idle-time, in minutes. Zero indicates
        no (infinite) timeout. Default is 15 minutes.
        </para></listitem></varlistentry>

-     
+

      <varlistentry><term>
        <literal>int maxrecordsize;</literal></term>
       <listitem><para>Maximum permissible record (message) size. Default
      <varlistentry><term>
        <literal>int maxrecordsize;</literal></term>
       <listitem><para>Maximum permissible record (message) size. Default

@@ -252,7 +252,7 @@ int statserv_main(int argc, char **argv,
       <listitem><para>Set user id to the user specified, after binding
        the listener addresses.
        </para></listitem></varlistentry>
       <listitem><para>Set user id to the user specified, after binding
        the listener addresses.
        </para></listitem></varlistentry>

-     
+

      <varlistentry><term>
        <literal>void (*bend_start)(struct statserv_options_block *p)</literal>
       </term>
      <varlistentry><term>
        <literal>void (*bend_start)(struct statserv_options_block *p)</literal>
       </term>

@@ -265,9 +265,9 @@ int statserv_main(int argc, char **argv,
        The default value of this pointer is NULL in which case it
        isn't invoked by the frontend server.
        When the server operates as an NT service this handler is called
        The default value of this pointer is NULL in which case it
        isn't invoked by the frontend server.
        When the server operates as an NT service this handler is called

-       whenever the service is started. 
+       whenever the service is started.

        </para></listitem></varlistentry>
        </para></listitem></varlistentry>

-     
+

      <varlistentry><term>
        <literal>void (*bend_stop)(struct statserv_options_block *p)</literal>
       </term>
      <varlistentry><term>
        <literal>void (*bend_stop)(struct statserv_options_block *p)</literal>
       </term>

@@ -293,7 +293,7 @@ int statserv_main(int argc, char **argv,
     a static area. You are allowed to change the contents of the structure,
     but the changes will not take effect before you call
    </para>
     a static area. You are allowed to change the contents of the structure,
     but the changes will not take effect before you call
    </para>

-   
+

    <synopsis>
 void statserv_setcontrol(statserv_options_block *block);
    </synopsis>
    <synopsis>
 void statserv_setcontrol(statserv_options_block *block);
    </synopsis>

@@ -348,35 +348,35 @@ bend_initresult (*bend_init)(bend_initrequest *r);
 typedef struct bend_initrequest
 {
     /** \brief user/name/password to be read */
 typedef struct bend_initrequest
 {
     /** \brief user/name/password to be read */

-    Z_IdAuthentication *auth; 
+    Z_IdAuthentication *auth;

     /** \brief encoding stream (for results) */
     ODR stream;
     /** \brief printing stream */
     ODR print;
     /** \brief decoding stream (use stream for results) */
     /** \brief encoding stream (for results) */
     ODR stream;
     /** \brief printing stream */
     ODR print;
     /** \brief decoding stream (use stream for results) */

-    ODR decode; 
+    ODR decode;

     /** \brief reference ID */
     Z_ReferenceId *referenceId;
     /** \brief peer address of client */
     /** \brief reference ID */
     Z_ReferenceId *referenceId;
     /** \brief peer address of client */

-    char *peer_name;           
-    
-    /** \brief character set and language negotiation 
+    char *peer_name;
+
+    /** \brief character set and language negotiation

 
 

-    see include/yaz/z-charneg.h 
+    see include/yaz/z-charneg.h

     */
     Z_CharSetandLanguageNegotiation *charneg_request;
 
     /** \brief character negotiation response */
     Z_External *charneg_response;
 
     */
     Z_CharSetandLanguageNegotiation *charneg_request;
 
     /** \brief character negotiation response */
     Z_External *charneg_response;
 

-    /** \brief character set (encoding) for query terms 
-        
+    /** \brief character set (encoding) for query terms
+

     This is NULL by default. It should be set to the native character
     set that the backend assumes for query terms */
     This is NULL by default. It should be set to the native character
     set that the backend assumes for query terms */

-    char *query_charset;      
+    char *query_charset;
+
+    /** \brief whehter query_charset also applies to recors

 
 

-    /** \brief whehter query_charset also applies to recors 
-    

     Is 0 (No) by default. Set to 1 (yes) if records is in the same
     character set as queries. If in doubt, use 0 (No).
     */
     Is 0 (No) by default. Set to 1 (yes) if records is in the same
     character set as queries. If in doubt, use 0 (No).
     */

@@ -448,7 +448,7 @@ typedef struct bend_initresult
     <para>
      The <literal>auth</literal> member holds the authentication information
      part of the Z39.50 Initialize Request. Interpret this if your serves
     <para>
      The <literal>auth</literal> member holds the authentication information
      part of the Z39.50 Initialize Request. Interpret this if your serves

-     requires authentication. 
+     requires authentication.

     </para>
 
     <para>
     </para>
 
     <para>

@@ -556,7 +556,7 @@ typedef struct {
      For SRU operation, a Bib-1 diagnostic code is mapped to
      SRU diagnostic.
     </para>
      For SRU operation, a Bib-1 diagnostic code is mapped to
      SRU diagnostic.
     </para>

-    
+

     <synopsis>
 int (*bend_fetch) (void *handle, bend_fetch_rr *rr);
 
     <synopsis>
 int (*bend_fetch) (void *handle, bend_fetch_rr *rr);
 

@@ -686,7 +686,7 @@ typedef struct {
     <para>
      Note that this is handler serves as a supplement for
      <function>bend_fetch</function> and need not to be defined in order to
     <para>
      Note that this is handler serves as a supplement for
      <function>bend_fetch</function> and need not to be defined in order to

-     support search - and retrieve. 
+     support search - and retrieve.

     </para>
 
    </sect2>
     </para>
 
    </sect2>

@@ -709,7 +709,7 @@ typedef struct bend_delete_rr {
     int delete_status;      /* status for the whole operation */
     int *statuses;          /* status each set - indexed as setnames */
     ODR stream;
     int delete_status;      /* status for the whole operation */
     int *statuses;          /* status each set - indexed as setnames */
     ODR stream;

-    ODR print; 
+    ODR print;

 } bend_delete_rr;
     </synopsis>
 
 } bend_delete_rr;
     </synopsis>
 

@@ -764,9 +764,9 @@ typedef struct bend_scan_rr {
 } bend_scan_rr;
     </synopsis>
    <para>
 } bend_scan_rr;
     </synopsis>
    <para>

-    This backend server handles both Z39.50 scan 
-    and SRU scan. In order for a handler to distinguish between SRU (CQL) scan 
-    Z39.50 Scan , it must check for a non-NULL value of 
+    This backend server handles both Z39.50 scan
+    and SRU scan. In order for a handler to distinguish between SRU (CQL) scan
+    Z39.50 Scan , it must check for a non-NULL value of

     <literal>scanClause</literal>.
    </para>
    <note>
     <literal>scanClause</literal>.
    </para>
    <note>

@@ -786,21 +786,21 @@ typedef struct bend_scan_rr {
    </para>
 
    &gfs-synopsis;
    </para>
 
    &gfs-synopsis;

-   
+

    <para>
     The options are:
 
     &gfs-options;
 
    </para>
    <para>
     The options are:
 
     &gfs-options;
 
    </para>

-   
+

    <para>
     A listener specification consists of a transport mode followed by a
     colon (:) followed by a listener address. The transport mode is
     either <literal>tcp</literal>, <literal>unix:</literal> or
     <literal>ssl</literal>.
    </para>
    <para>
     A listener specification consists of a transport mode followed by a
     colon (:) followed by a listener address. The transport mode is
     either <literal>tcp</literal>, <literal>unix:</literal> or
     <literal>ssl</literal>.
    </para>

-   
+

    <para>
     For TCP and SSL, an address has the form
    </para>
    <para>
     For TCP and SSL, an address has the form
    </para>

@@ -808,7 +808,7 @@ typedef struct bend_scan_rr {
    <synopsis>
     hostname | IP-number [: portnumber]
    </synopsis>
    <synopsis>
     hostname | IP-number [: portnumber]
    </synopsis>

-   
+

    <para>
     The port number defaults to 210 (standard Z39.50 port).
    </para>
    <para>
     The port number defaults to 210 (standard Z39.50 port).
    </para>

@@ -819,10 +819,10 @@ typedef struct bend_scan_rr {
 
    <para>
     For TCP/IP and SSL, the special hostnames <literal>@</literal> and
 
    <para>
     For TCP/IP and SSL, the special hostnames <literal>@</literal> and

-    <literal>@6</literal> are mapped to the addresses 
+    <literal>@6</literal> are mapped to the addresses

     <literal>INADDR_ANY</literal> (IPV4) and
     <literal>IN6ADDR_ANY_INIT</literal> (IPV6)
     <literal>INADDR_ANY</literal> (IPV4) and
     <literal>IN6ADDR_ANY_INIT</literal> (IPV6)

-    respectively. 
+    respectively.

    </para>
 
    <example id="server.example.running.unix"><title>Running the GFS on Unix</title>
    </para>
 
    <example id="server.example.running.unix"><title>Running the GFS on Unix</title>

@@ -845,7 +845,7 @@ typedef struct bend_scan_rr {
      as your public web server and want to offer HTTP port 80
      access to the YAZ server on 210, you can use the
      <ulink url="&url.apache.directive.proxypass;">
      as your public web server and want to offer HTTP port 80
      access to the YAZ server on 210, you can use the
      <ulink url="&url.apache.directive.proxypass;">

-      <literal>ProxyPass</literal></ulink> 
+      <literal>ProxyPass</literal></ulink>

      directive.
      If you have virtual host
      <literal>srw.mydomain</literal> you can use the following directives
      directive.
      If you have virtual host
      <literal>srw.mydomain</literal> you can use the following directives

@@ -878,7 +878,7 @@ typedef struct bend_scan_rr {
    &gfs-virtual;
   </sect1>
  </chapter>
    &gfs-virtual;
   </sect1>
  </chapter>

- 
+

  <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml
  <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml

diff --git a/doc/soap.xml b/doc/soap.xml
index 46e785f..c665367 100644 (file)
--- a/doc/soap.xml
+++ b/doc/soap.xml
@@ -1,10 +1,10 @@
 <chapter id="soap"><title>SOAP and SRU</title>
   <sect1 id="soap.introduction"><title>Introduction</title>
     <para>
 <chapter id="soap"><title>SOAP and SRU</title>
   <sect1 id="soap.introduction"><title>Introduction</title>
     <para>

-      &yaz; uses a very simple implementation of 
+      &yaz; uses a very simple implementation of

       <ulink url="&url.soap;">SOAP</ulink> that only,
       currenly, supports what is sufficient to offer SRU SOAP functionality.
       <ulink url="&url.soap;">SOAP</ulink> that only,
       currenly, supports what is sufficient to offer SRU SOAP functionality.

-      The implementation uses the 
+      The implementation uses the

       <ulink url="&url.libxml2.api.tree;">tree API</ulink> of
       libxml2 to encode and decode SOAP packages.
     </para>
       <ulink url="&url.libxml2.api.tree;">tree API</ulink> of
       libxml2 to encode and decode SOAP packages.
     </para>

@@ -168,7 +168,7 @@ int yaz_srw_codec(ODR o, void * pptr,
                   void *client_data, const char *ns);
       </synopsis>
       Here, <literal>Z_SRW_GDU</literal> is either
                   void *client_data, const char *ns);
       </synopsis>
       Here, <literal>Z_SRW_GDU</literal> is either

-      searchRetrieveRequest or a searchRetrieveResponse. 
+      searchRetrieveRequest or a searchRetrieveResponse.

     </para>
     <note>
       <para>
     </para>
     <note>
       <para>

@@ -222,7 +222,7 @@ typedef struct {
     int * numberOfRecords;
     char * resultSetId;
     int * resultSetIdleTime;
     int * numberOfRecords;
     char * resultSetId;
     int * resultSetIdleTime;

-    
+

     Z_SRW_record *records;
     int num_records;
 
     Z_SRW_record *records;
     int num_records;
 

diff --git a/doc/tools.xml b/doc/tools.xml
index e1209a1..132cb9b 100644 (file)
--- a/doc/tools.xml
+++ b/doc/tools.xml
@@ -1,5 +1,5 @@
  <chapter id="tools"><title>Supporting Tools</title>
  <chapter id="tools"><title>Supporting Tools</title>

-  
+

   <para>
    In support of the service API - primarily the ASN module, which
    provides the pro-grammatic interface to the Z39.50 APDUs, &yaz; contains
   <para>
    In support of the service API - primarily the ASN module, which
    provides the pro-grammatic interface to the Z39.50 APDUs, &yaz; contains

@@ -40,7 +40,7 @@
      </para>
     </note>
     <para>
      </para>
     </note>
     <para>

-     The PQF is defined by the pquery module in the YAZ library. 
+     The PQF is defined by the pquery module in the YAZ library.

      There are two sets of function that have similar behavior. First
      set operates on a PQF parser handle, second set doesn't. First set
      set of functions are more flexible than the second set. Second set
      There are two sets of function that have similar behavior. First
      set operates on a PQF parser handle, second set doesn't. First set
      set of functions are more flexible than the second set. Second set

@@ -73,7 +73,7 @@
      a Z39.50 RPN Query is returned which is created using ODR stream
      <literal>o</literal>. If parsing failed, a NULL pointer is
      returned.
      a Z39.50 RPN Query is returned which is created using ODR stream
      <literal>o</literal>. If parsing failed, a NULL pointer is
      returned.

-     Function <function>yaz_pqf_scan</function> takes a scan query in 
+     Function <function>yaz_pqf_scan</function> takes a scan query in

      <literal>qbuf</literal>. If parsing was successful, the function
      returns attributes plus term pointer and modifies
      <literal>attributeSetId</literal> to hold attribute set for the
      <literal>qbuf</literal>. If parsing was successful, the function
      returns attributes plus term pointer and modifies
      <literal>attributeSetId</literal> to hold attribute set for the

@@ -110,7 +110,7 @@
     <para>
      If the parse went well, <function>p_query_rpn()</function> returns a
      pointer to a <literal>Z_RPNQuery</literal> structure which can be
     <para>
      If the parse went well, <function>p_query_rpn()</function> returns a
      pointer to a <literal>Z_RPNQuery</literal> structure which can be

-     placed directly into a <literal>Z_SearchRequest</literal>. 
+     placed directly into a <literal>Z_SearchRequest</literal>.

      If parsing failed, due to syntax error, a NULL pointer is returned.
     </para>
     <para>
      If parsing failed, due to syntax error, a NULL pointer is returned.
     </para>
     <para>

@@ -170,7 +170,7 @@
     </para>
 
     <para>
     </para>
 
     <para>

-     The @attr operator is followed by an attribute specification 
+     The @attr operator is followed by an attribute specification

      (<literal>attr-spec</literal> above). The specification consists
      of an optional attribute set, an attribute type-value pair and
      a sub-query. The attribute type-value pair is packed in one string:
      (<literal>attr-spec</literal> above). The specification consists
      of an optional attribute set, an attribute type-value pair and
      a sub-query. The attribute type-value pair is packed in one string:

@@ -194,7 +194,7 @@
      is used.  This is the only encoding allowed in both versions 2 and 3
      of the Z39.50 standard.
     </para>
      is used.  This is the only encoding allowed in both versions 2 and 3
      of the Z39.50 standard.
     </para>

-    
+

     <sect3 id="PQF-prox">
       <title>Using Proximity Operators with PQF</title>
       <note>
     <sect3 id="PQF-prox">
       <title>Using Proximity Operators with PQF</title>
       <note>

@@ -221,7 +221,7 @@
       <para>
         The proximity operator <literal>@prox</literal> is a special
         and more restrictive version of the conjunction operator
       <para>
         The proximity operator <literal>@prox</literal> is a special
         and more restrictive version of the conjunction operator

-        <literal>@and</literal>.  Its semantics are described in 
+        <literal>@and</literal>.  Its semantics are described in

        section 3.7.2 (Proximity) of Z39.50 the standard itself, which
         can be read on-line at
        <ulink url="&url.z39.50.proximity;"/>
        section 3.7.2 (Proximity) of Z39.50 the standard itself, which
         can be read on-line at
        <ulink url="&url.z39.50.proximity;"/>

@@ -401,9 +401,9 @@
       <para>
        <screen>
        @or @and bob dylan @set Result-1
       <para>
        <screen>
        @or @and bob dylan @set Result-1

-       
+

        @attr 4=1 @and @attr 1=1 "bob dylan" @attr 1=4 "slow train coming"
        @attr 4=1 @and @attr 1=1 "bob dylan" @attr 1=4 "slow train coming"

-       
+

        @and @attr 2=4 @attr gils 1=2038 -114 @attr 2=2 @attr gils 1=2039 -109
       </screen>
        <note>
        @and @attr 2=4 @attr gils 1=2038 -114 @attr 2=2 @attr gils 1=2039 -109
       </screen>
        <note>

@@ -483,45 +483,45 @@
       -- Proximity operator
 
      </screen>
       -- Proximity operator
 
      </screen>

-     
+

      <example id="example.ccl.queries">
       <title>CCL queries</title>
       <para>
        The following queries are all valid:
       </para>
      <example id="example.ccl.queries">
       <title>CCL queries</title>
       <para>
        The following queries are all valid:
       </para>

-      
+

       <screen>
        dylan
       <screen>
        dylan

-       
+

        "bob dylan"
        "bob dylan"

-       
+

        dylan or zimmerman
        dylan or zimmerman

-       
+

        set=1
        set=1

-       
+

        (dylan and bob) or set=1
        (dylan and bob) or set=1

-       
+

       </screen>
       <para>
        Assuming that the qualifiers <literal>ti</literal>,
        <literal>au</literal>
        and <literal>date</literal> are defined we may use:
       </para>
       </screen>
       <para>
        Assuming that the qualifiers <literal>ti</literal>,
        <literal>au</literal>
        and <literal>date</literal> are defined we may use:
       </para>

-      
+

       <screen>
        ti=self portrait
       <screen>
        ti=self portrait

-       
+

        au=(bob dylan and slow train coming)
 
        date>1980 and (ti=((self portrait)))
        au=(bob dylan and slow train coming)
 
        date>1980 and (ti=((self portrait)))

-       
+

       </screen>
      </example>
       </screen>
      </example>

-     
+

     </sect3>
     <sect3 id="ccl.qualifiers">
      <title>CCL Qualifiers</title>
     </sect3>
     <sect3 id="ccl.qualifiers">
      <title>CCL Qualifiers</title>

-     
+

      <para>
       Qualifiers are used to direct the search to a particular searchable
       index, such as title (ti) and author indexes (au). The CCL standard
      <para>
       Qualifiers are used to direct the search to a particular searchable
       index, such as title (ti) and author indexes (au). The CCL standard

@@ -547,13 +547,13 @@
       <para>
        A qualifier specification is of the form:
       </para>
       <para>
        A qualifier specification is of the form:
       </para>

-      
+

       <para>
       <para>

-       <replaceable>qualifier-name</replaceable>  
+       <replaceable>qualifier-name</replaceable>

        [<replaceable>attributeset</replaceable><literal>,</literal>]<replaceable>type</replaceable><literal>=</literal><replaceable>val</replaceable>
        [<replaceable>attributeset</replaceable><literal>,</literal>]<replaceable>type</replaceable><literal>=</literal><replaceable>val</replaceable>

-       [<replaceable>attributeset</replaceable><literal>,</literal>]<replaceable>type</replaceable><literal>=</literal><replaceable>val</replaceable> ...      
+       [<replaceable>attributeset</replaceable><literal>,</literal>]<replaceable>type</replaceable><literal>=</literal><replaceable>val</replaceable> ...

       </para>
       </para>

-      
+

       <para>
        where <replaceable>qualifier-name</replaceable> is the name of the
        qualifier to be used (eg. <literal>ti</literal>),
       <para>
        where <replaceable>qualifier-name</replaceable> is the name of the
        qualifier to be used (eg. <literal>ti</literal>),

@@ -562,7 +562,7 @@
        <replaceable>val</replaceable> is attribute value.
        The <replaceable>type</replaceable> can be specified as an
        integer or as it be specified either as a single-letter:
        <replaceable>val</replaceable> is attribute value.
        The <replaceable>type</replaceable> can be specified as an
        integer or as it be specified either as a single-letter:

-       <literal>u</literal> for use, 
+       <literal>u</literal> for use,

        <literal>r</literal> for relation,<literal>p</literal> for position,
        <literal>s</literal> for structure,<literal>t</literal> for truncation
        or <literal>c</literal> for completeness.
        <literal>r</literal> for relation,<literal>p</literal> for position,
        <literal>s</literal> for structure,<literal>t</literal> for truncation
        or <literal>c</literal> for completeness.

@@ -644,10 +644,10 @@
        <ulink url="&url.z39.50.attset.bib1;">list of Bib-1 attributes</ulink>
       </para>
       <para>
        <ulink url="&url.z39.50.attset.bib1;">list of Bib-1 attributes</ulink>
       </para>
       <para>

-       It is also possible to specify non-numeric attribute values, 
+       It is also possible to specify non-numeric attribute values,

        which are used in combination with certain types.
        The special combinations are:
        which are used in combination with certain types.
        The special combinations are:

-       
+

        <table id="ccl.special.attribute.combos">
        <title>Special attribute combos</title>
        <tgroup cols="2">
        <table id="ccl.special.attribute.combos">
        <title>Special attribute combos</title>
        <tgroup cols="2">

@@ -672,13 +672,13 @@
            This does not set the structure at all.
           </entry>
          </row>
            This does not set the structure at all.
           </entry>
          </row>

-         
+

          <row><entry><literal>s=ol</literal></entry><entry>
            Each token in the term is ORed. (or-list).
            This does not set the structure at all.
           </entry>
          </row>
          <row><entry><literal>s=ol</literal></entry><entry>
            Each token in the term is ORed. (or-list).
            This does not set the structure at all.
           </entry>
          </row>

-         
+

          <row><entry><literal>s=ag</literal></entry><entry>
            Tokens that appears as phrases (with blank in them) gets
            structure phrase attached. Tokens that appers as words
          <row><entry><literal>s=ag</literal></entry><entry>
            Tokens that appears as phrases (with blank in them) gets
            structure phrase attached. Tokens that appers as words

@@ -696,13 +696,13 @@
            This sets Bib-1 relation attribute accordingly (relation
            ordered). A query construct is only treated as a range if
            dash is used and that is surrounded by white-space. So
            This sets Bib-1 relation attribute accordingly (relation
            ordered). A query construct is only treated as a range if
            dash is used and that is surrounded by white-space. So

-           <literal>-1980</literal> is treated as term 
+           <literal>-1980</literal> is treated as term

            <literal>"-1980"</literal> not <literal>&lt;= 1980</literal>.
            If <literal>- 1980</literal> is used, however, that is
            treated as a range.
           </entry>
          </row>
            <literal>"-1980"</literal> not <literal>&lt;= 1980</literal>.
            If <literal>- 1980</literal> is used, however, that is
            treated as a range.
           </entry>
          </row>

-         
+

          <row><entry><literal>r=r</literal></entry><entry>
            Similar to <literal>r=o</literal> but assumes that terms
            are non-negative (not prefixed with <literal>-</literal>).
          <row><entry><literal>r=r</literal></entry><entry>
            Similar to <literal>r=o</literal> but assumes that terms
            are non-negative (not prefixed with <literal>-</literal>).

@@ -714,27 +714,27 @@
            <literal>r=r</literal> is available in YAZ 2.0.24 or later.
           </entry>
          </row>
            <literal>r=r</literal> is available in YAZ 2.0.24 or later.
           </entry>
          </row>

-         
+

          <row><entry><literal>t=l</literal></entry><entry>
            Allows term to be left-truncated.
            If term is of the form <literal>?x</literal>, the resulting
            Type-1 term is <literal>x</literal> and truncation is left.
           </entry>
          </row>
          <row><entry><literal>t=l</literal></entry><entry>
            Allows term to be left-truncated.
            If term is of the form <literal>?x</literal>, the resulting
            Type-1 term is <literal>x</literal> and truncation is left.
           </entry>
          </row>

-         
+

          <row><entry><literal>t=r</literal></entry><entry>
            Allows term to be right-truncated.
            If term is of the form <literal>x?</literal>, the resulting
            Type-1 term is <literal>x</literal> and truncation is right.
           </entry>
          </row>
          <row><entry><literal>t=r</literal></entry><entry>
            Allows term to be right-truncated.
            If term is of the form <literal>x?</literal>, the resulting
            Type-1 term is <literal>x</literal> and truncation is right.
           </entry>
          </row>

-         
+

          <row><entry><literal>t=n</literal></entry><entry>
            If term is does not include <literal>?</literal>, the
            truncation attribute is set to none (100).
           </entry>
          </row>
          <row><entry><literal>t=n</literal></entry><entry>
            If term is does not include <literal>?</literal>, the
            truncation attribute is set to none (100).
           </entry>
          </row>

-         
+

          <row><entry><literal>t=b</literal></entry><entry>
            Allows term to be both left&amp;right truncated.
            If term is of the form <literal>?x?</literal>, the
          <row><entry><literal>t=b</literal></entry><entry>
            Allows term to be both left&amp;right truncated.
            If term is of the form <literal>?x?</literal>, the

@@ -768,7 +768,7 @@
        <para>
        Consider the following definition:
        </para>
        <para>
        Consider the following definition:
        </para>

-       
+

        <screen>
        ti       u=4 s=1
        au       u=1 s=1
        <screen>
        ti       u=4 s=1
        au       u=1 s=1

@@ -777,7 +777,7 @@
        date     u=30 r=o
       </screen>
        <para>
        date     u=30 r=o
       </screen>
        <para>

-       <literal>ti</literal> and <literal>au</literal> both set 
+       <literal>ti</literal> and <literal>au</literal> both set

        structure attribute to phrase (s=1).
        <literal>ti</literal>
        sets the use-attribute to 4. <literal>au</literal> sets the
        structure attribute to phrase (s=1).
        <literal>ti</literal>
        sets the use-attribute to 4. <literal>au</literal> sets the

@@ -790,7 +790,7 @@
        </para>
        <para>
        You can combine attributes. To Search for "ranked title" you
        </para>
        <para>
        You can combine attributes. To Search for "ranked title" you

-       can do 
+       can do

        <screen>
         ti,ranked=knuth computer
        </screen>
        <screen>
         ti,ranked=knuth computer
        </screen>

@@ -815,12 +815,12 @@
        A qualifier alias is of the form:
       </para>
       <para>
        A qualifier alias is of the form:
       </para>
       <para>

-       <replaceable>q</replaceable>  
+       <replaceable>q</replaceable>

        <replaceable>q1</replaceable> <replaceable>q2</replaceable> ..
       </para>
       <para>
        which declares <replaceable>q</replaceable> to
        <replaceable>q1</replaceable> <replaceable>q2</replaceable> ..
       </para>
       <para>
        which declares <replaceable>q</replaceable> to

-       be an alias for <replaceable>q1</replaceable>, 
+       be an alias for <replaceable>q1</replaceable>,

        <replaceable>q2</replaceable>... such that the CCL
        query <replaceable>q=x</replaceable> is equivalent to
        <replaceable>q1=x or q2=x or ...</replaceable>.
        <replaceable>q2</replaceable>... such that the CCL
        query <replaceable>q=x</replaceable> is equivalent to
        <replaceable>q1=x or q2=x or ...</replaceable>.

@@ -983,7 +983,7 @@ struct ccl_rpn_node *ccl_find_str (CCL_bibset bibset, const char *str,
     </para>
     <tip>
      <para>
     </para>
     <tip>
      <para>

-      If you are new to CQL, read the 
+      If you are new to CQL, read the

       <ulink url="&url.cql.intro;">Gentle Introduction</ulink>.
      </para>
     </tip>
       <ulink url="&url.cql.intro;">Gentle Introduction</ulink>.
      </para>
     </tip>

@@ -1066,7 +1066,7 @@ int cql_parser_stdio(CQL_parser cp, FILE *f);
       uses a <literal>FILE</literal> handle which is opened for reading.
      </para>
     </sect3>
       uses a <literal>FILE</literal> handle which is opened for reading.
      </para>
     </sect3>

-    
+

     <sect3 id="cql.tree"><title>CQL tree</title>
      <para>
       The the query string is valid, the CQL parser
     <sect3 id="cql.tree"><title>CQL tree</title>
      <para>
       The the query string is valid, the CQL parser

@@ -1081,7 +1081,7 @@ struct cql_node *cql_parser_result(CQL_parser cp);
       a pointer to the root node of the resulting tree.
      </para>
      <para>
       a pointer to the root node of the resulting tree.
      </para>
      <para>

-      Each node in a CQL tree is represented by a 
+      Each node in a CQL tree is represented by a

       <literal>struct cql_node</literal>.
       It is defined as follows:
       <synopsis>
       <literal>struct cql_node</literal>.
       It is defined as follows:
       <synopsis>

@@ -1175,7 +1175,7 @@ struct cql_node {
      <para>
       Conversion to PQF (and Z39.50 RPN) is tricky by the fact
       that the resulting RPN depends on the Z39.50 target
      <para>
       Conversion to PQF (and Z39.50 RPN) is tricky by the fact
       that the resulting RPN depends on the Z39.50 target

-      capabilities (combinations of supported attributes). 
+      capabilities (combinations of supported attributes).

       In addition, the CQL and SRU operates on index prefixes
       (URI or strings), whereas the RPN uses Object Identifiers
       for attribute sets.
       In addition, the CQL and SRU operates on index prefixes
       (URI or strings), whereas the RPN uses Object Identifiers
       for attribute sets.

@@ -1193,7 +1193,7 @@ void cql_transform_close(cql_transform_t ct);
       either an already open FILE or from a filename respectively.
      </para>
      <para>
       either an already open FILE or from a filename respectively.
      </para>
      <para>

-      The handle is destroyed by <function>cql_transform_close</function> 
+      The handle is destroyed by <function>cql_transform_close</function>

       in which case no further reference of the handle is allowed.
      </para>
      <para>
       in which case no further reference of the handle is allowed.
      </para>
      <para>

@@ -1203,7 +1203,7 @@ void cql_transform_close(cql_transform_t ct);
 int cql_transform_buf(cql_transform_t ct,
                       struct cql_node *cn, char *out, int max);
       </synopsis>
 int cql_transform_buf(cql_transform_t ct,
                       struct cql_node *cn, char *out, int max);
       </synopsis>

-      This function converts the CQL tree <literal>cn</literal> 
+      This function converts the CQL tree <literal>cn</literal>

       using handle <literal>ct</literal>.
       For the resulting PQF, you supply a buffer <literal>out</literal>
       which must be able to hold at at least <literal>max</literal>
       using handle <literal>ct</literal>.
       For the resulting PQF, you supply a buffer <literal>out</literal>
       which must be able to hold at at least <literal>max</literal>

@@ -1256,7 +1256,7 @@ int cql_transform_FILE(cql_transform_t ct,
     <sect3 id="cql.to.rpn">
      <title>Specification of CQL to RPN mappings</title>
      <para>
     <sect3 id="cql.to.rpn">
      <title>Specification of CQL to RPN mappings</title>
      <para>

-      The file supplied to functions 
+      The file supplied to functions

       <function>cql_transform_open_FILE</function>,
       <function>cql_transform_open_fname</function> follows
       a structure found in many Unix utilities.
       <function>cql_transform_open_FILE</function>,
       <function>cql_transform_open_fname</function> follows
       a structure found in many Unix utilities.

@@ -1294,7 +1294,7 @@ int cql_transform_FILE(cql_transform_t ct,
         </term>
         <listitem>
          <para>
         </term>
         <listitem>
          <para>

-          This pattern is invoked when a CQL index, such as 
+          This pattern is invoked when a CQL index, such as

           dc.title is converted. <replaceable>set</replaceable>
           and <replaceable>name</replaceable> are the context set and index
           name respectively.
           dc.title is converted. <replaceable>set</replaceable>
           and <replaceable>name</replaceable> are the context set and index
           name respectively.

@@ -1308,7 +1308,7 @@ int cql_transform_FILE(cql_transform_t ct,
           If this pattern is not defined, the mapping will fail.
          </para>
          <para>
           If this pattern is not defined, the mapping will fail.
          </para>
          <para>

-          The pattern, 
+          The pattern,

           <literal>index.</literal><replaceable>set</replaceable><literal>.*</literal>
           is used when no other index pattern is matched.
         </para>
           <literal>index.</literal><replaceable>set</replaceable><literal>.*</literal>
           is used when no other index pattern is matched.
         </para>

@@ -1373,7 +1373,7 @@ int cql_transform_FILE(cql_transform_t ct,
          <para>
           This pattern specifies how a CQL structure is mapped to RPN.
           Note that this CQL pattern is somewhat to similar to
          <para>
           This pattern specifies how a CQL structure is mapped to RPN.
           Note that this CQL pattern is somewhat to similar to

-          CQL pattern <literal>relation</literal>. 
+          CQL pattern <literal>relation</literal>.

           The <replaceable>type</replaceable> is a CQL relation.
          </para>
          <para>
           The <replaceable>type</replaceable> is a CQL relation.
          </para>
          <para>

@@ -1408,7 +1408,7 @@ int cql_transform_FILE(cql_transform_t ct,
         <listitem>
          <para>
           This specification defines a CQL context set for a given prefix.
         <listitem>
          <para>
           This specification defines a CQL context set for a given prefix.

-          The value on the right hand side is the URI for the set - 
+          The value on the right hand side is the URI for the set -

           <emphasis>not</emphasis> RPN. All prefixes used in
           index patterns must be defined this way.
          </para>
           <emphasis>not</emphasis> RPN. All prefixes used in
           index patterns must be defined this way.
          </para>

@@ -1441,7 +1441,7 @@ int cql_transform_FILE(cql_transform_t ct,
        index.cql.serverChoice = 1=1016
        index.dc.title         = 1=4
        index.dc.subject       = 1=21
        index.cql.serverChoice = 1=1016
        index.dc.title         = 1=4
        index.dc.subject       = 1=21

-  
+

        relation.<             = 2=1
        relation.eq            = 2=3
        relation.scr           = 2=3
        relation.<             = 2=1
        relation.eq            = 2=3
        relation.scr           = 2=3

@@ -1536,7 +1536,7 @@ int cql_transform_FILE(cql_transform_t ct,
       containing XCQL).
       <synopsis>
 int cql_to_xml_buf(struct cql_node *cn, char *out, int max);
       containing XCQL).
       <synopsis>
 int cql_to_xml_buf(struct cql_node *cn, char *out, int max);

-void cql_to_xml(struct cql_node *cn, 
+void cql_to_xml(struct cql_node *cn,

                 void (*pr)(const char *buf, void *client_data),
                 void *client_data);
 void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
                 void (*pr)(const char *buf, void *client_data),
                 void *client_data);
 void cql_to_xml_stdio(struct cql_node *cn, FILE *f);

@@ -1558,7 +1558,7 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
 
    <para>
     The basic YAZ representation of an OID is an array of integers,
 
    <para>
     The basic YAZ representation of an OID is an array of integers,

-    terminated with the value -1. This integer is of type 
+    terminated with the value -1. This integer is of type

     <literal>Odr_oid</literal>.
    </para>
    <para>
     <literal>Odr_oid</literal>.
    </para>
    <para>

@@ -1641,12 +1641,12 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
      Odr_oid *odr_oiddup(ODR odr, const Odr_oid *o);
     </screen>
    </para>
      Odr_oid *odr_oiddup(ODR odr, const Odr_oid *o);
     </screen>
    </para>

-   
+

    <para>
     OIDs can be compared with <function>oid_oidcmp</function> which returns
     zero if the two OIDs provided are identical; non-zero otherwise.
    </para>
    <para>
     OIDs can be compared with <function>oid_oidcmp</function> which returns
     zero if the two OIDs provided are identical; non-zero otherwise.
    </para>

- 
+

    <sect2 id="tools.oid.database"><title>OID database</title>
     <para>
      From YAZ version 3 and later, the oident system has been replaced
    <sect2 id="tools.oid.database"><title>OID database</title>
     <para>
      From YAZ version 3 and later, the oident system has been replaced

@@ -1659,21 +1659,21 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
      convert from string to OID or other way around.
     </para>
     <para>
      convert from string to OID or other way around.
     </para>
     <para>

-     Unfortunately, whenever we supply a string we must also specify the 
+     Unfortunately, whenever we supply a string we must also specify the

      <emphasis>OID class</emphasis>. The class is necessary because some
      strings correspond to multiple OIDs. An example of such a string is
      <emphasis>OID class</emphasis>. The class is necessary because some
      strings correspond to multiple OIDs. An example of such a string is

-     <literal>Bib-1</literal> which may either be an attribute-set 
+     <literal>Bib-1</literal> which may either be an attribute-set

      or a diagnostic-set.
     </para>
     <para>
      or a diagnostic-set.
     </para>
     <para>

-     Applications using the YAZ database should include 
+     Applications using the YAZ database should include

      <filename>yaz/oid_db.h</filename>.
     </para>
     <para>
      A YAZ database handle is of type <literal>yaz_oid_db_t</literal>.
      Actually that's a pointer. You need not think deal with that.
      YAZ has a built-in database which can be considered "constant" for
      <filename>yaz/oid_db.h</filename>.
     </para>
     <para>
      A YAZ database handle is of type <literal>yaz_oid_db_t</literal>.
      Actually that's a pointer. You need not think deal with that.
      YAZ has a built-in database which can be considered "constant" for

-     most purposes. 
+     most purposes.

      We can get hold that by using function <function>yaz_oid_std</function>.
     </para>
     <para>
      We can get hold that by using function <function>yaz_oid_std</function>.
     </para>
     <para>

@@ -1692,7 +1692,7 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
       We can create an OID for the Bib-1 attribute set on the ODR stream
       odr with:
      <screen>
       We can create an OID for the Bib-1 attribute set on the ODR stream
       odr with:
      <screen>

-        Odr_oid *bib1 = 
+        Odr_oid *bib1 =

          yaz_string_to_oid_odr(yaz_oid_std(), CLASS_ATTSET, "Bib-1", odr);
       </screen>
       This is more complex than using <function>odr_getoidbystr</function>.
          yaz_string_to_oid_odr(yaz_oid_std(), CLASS_ATTSET, "Bib-1", odr);
       </screen>
       This is more complex than using <function>odr_getoidbystr</function>.

@@ -1703,7 +1703,7 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
 
    </sect2>
    <sect2 id="tools.oid.std"><title>Standard OIDs</title>
 
    </sect2>
    <sect2 id="tools.oid.std"><title>Standard OIDs</title>

-     
+

     <para>
      All the object identifers in the standard OID database as returned
      by <function>yaz_oid_std</function> can referenced directly in a
     <para>
      All the object identifers in the standard OID database as returned
      by <function>yaz_oid_std</function> can referenced directly in a

@@ -1784,16 +1784,16 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
     <emphasis>not</emphasis> call <function>nmem_init</function> or
     <function>nmem_exit</function> unless you're absolute sure what
     you're doing. Note that in previous &yaz; versions you'd have to call
     <emphasis>not</emphasis> call <function>nmem_init</function> or
     <function>nmem_exit</function> unless you're absolute sure what
     you're doing. Note that in previous &yaz; versions you'd have to call

-    <function>nmem_init</function> yourself. 
+    <function>nmem_init</function> yourself.

    </para>
 
   </sect1>
 
   <sect1 id="tools.log"><title>Log</title>
   <para>
    </para>
 
   </sect1>
 
   <sect1 id="tools.log"><title>Log</title>
   <para>

-   &yaz; has evolved a fairly complex log system which should be useful both 
+   &yaz; has evolved a fairly complex log system which should be useful both

    for debugging &yaz; itself, debugging applications that use &yaz;, and for
    for debugging &yaz; itself, debugging applications that use &yaz;, and for

-   production use of those applications.  
+   production use of those applications.

   </para>
   <para>
    The log functions are declared in header <filename>yaz/log.h</filename>
   </para>
   <para>
    The log functions are declared in header <filename>yaz/log.h</filename>

@@ -1847,7 +1847,7 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
    logged. This string should be a comma-separated list of log level names,
    and can contain both hard-coded names and dynamic ones. The log level
    calculation starts with <literal>YLOG_DEFAULT_LEVEL</literal> and adds a bit
    logged. This string should be a comma-separated list of log level names,
    and can contain both hard-coded names and dynamic ones. The log level
    calculation starts with <literal>YLOG_DEFAULT_LEVEL</literal> and adds a bit

-   for each word it meets, unless the word starts with a '-', in which case it 
+   for each word it meets, unless the word starts with a '-', in which case it

    clears the bit. If the string <literal>'none'</literal> is found,
    all bits are cleared. Typically this string comes from the command-line,
    often identified by <literal>-v</literal>. The
    clears the bit. If the string <literal>'none'</literal> is found,
    all bits are cleared. Typically this string comes from the command-line,
    often identified by <literal>-v</literal>. The

@@ -1856,15 +1856,15 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
   </para>
 
   <para>
   </para>
 
   <para>

-   Each module should check what log bits it should be used, by calling 
+   Each module should check what log bits it should be used, by calling

    <function>yaz_log_module_level</function> with a suitable name for the
    module. The name is cleared from a preceding path and an extension, if any,
    so it is quite possible to use <literal>__FILE__</literal> for it. If the
    name has been passed to <function>yaz_log_mask_str</function>, the routine
    returns a non-zero bitmask, which should then be used in consequent calls
    to yaz_log. (It can also be tested, so as to avoid unnecessary calls to
    <function>yaz_log_module_level</function> with a suitable name for the
    module. The name is cleared from a preceding path and an extension, if any,
    so it is quite possible to use <literal>__FILE__</literal> for it. If the
    name has been passed to <function>yaz_log_mask_str</function>, the routine
    returns a non-zero bitmask, which should then be used in consequent calls
    to yaz_log. (It can also be tested, so as to avoid unnecessary calls to

-   yaz_log, in time-critical places, or when the log entry would take time 
-   to construct.) 
+   yaz_log, in time-critical places, or when the log entry would take time
+   to construct.)

   </para>
 
   <para>
   </para>
 
   <para>

@@ -1926,20 +1926,20 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
   <para>
    The log system is almost independent of the rest of &yaz;, the only
    important dependence is of <filename>nmem</filename>, and that only for
   <para>
    The log system is almost independent of the rest of &yaz;, the only
    important dependence is of <filename>nmem</filename>, and that only for

-   using the semaphore definition there. 
+   using the semaphore definition there.

   </para>
 
   <para>
    The dynamic log levels and log rotation were introduced in &yaz; 2.0.28. At
    the same time, the log bit names were changed from
   </para>
 
   <para>
    The dynamic log levels and log rotation were introduced in &yaz; 2.0.28. At
    the same time, the log bit names were changed from

-   <literal>LOG_something</literal> to <literal>YLOG_something</literal>, 
+   <literal>LOG_something</literal> to <literal>YLOG_something</literal>,

    to avoid collision with <filename>syslog.h</filename>.
   </para>
 
   </sect1>
    to avoid collision with <filename>syslog.h</filename>.
   </para>
 
   </sect1>

-  
+

   <sect1 id="marc"><title>MARC</title>
   <sect1 id="marc"><title>MARC</title>

-   
+

    <para>
     YAZ provides a fast utility for working with MARC records.
     Early versions of the MARC utility only allowed decoding of ISO2709.
    <para>
     YAZ provides a fast utility for working with MARC records.
     Early versions of the MARC utility only allowed decoding of ISO2709.

@@ -2059,7 +2059,7 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
     </variablelist>
    </para>
    <para>
     </variablelist>
    </para>
    <para>

-    The actual conversion functions are 
+    The actual conversion functions are

     <function>yaz_marc_decode_buf</function> and
     <function>yaz_marc_decode_wrbuf</function> which decodes and encodes
     a MARC record. The former function operates on simple buffers, the
     <function>yaz_marc_decode_buf</function> and
     <function>yaz_marc_decode_wrbuf</function> which decodes and encodes
     a MARC record. The former function operates on simple buffers, the

@@ -2117,7 +2117,7 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
        <literal>collection</literal>.
        </para></listitem>
       <listitem><para>
        <literal>collection</literal>.
        </para></listitem>
       <listitem><para>

-       The leader is encoded as element <literal>l</literal> with the 
+       The leader is encoded as element <literal>l</literal> with the

        leader content as its (text) value.
        </para></listitem>
       <listitem><para>
        leader content as its (text) value.
        </para></listitem>
       <listitem><para>

@@ -2160,7 +2160,7 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
     YAZ version 2.1.20 or later includes a Retrieval facility tool
     which allows a SRU/Z39.50 to describe itself and perform record
     conversions. The idea is the following:
     YAZ version 2.1.20 or later includes a Retrieval facility tool
     which allows a SRU/Z39.50 to describe itself and perform record
     conversions. The idea is the following:

-    
+

     <itemizedlist>
      <listitem>
       <para>
     <itemizedlist>
      <listitem>
       <para>

@@ -2208,13 +2208,13 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
    <sect2 id="tools.retrieval.format">
     <title>Retrieval XML format</title>
     <para>
    <sect2 id="tools.retrieval.format">
     <title>Retrieval XML format</title>
     <para>

-     All elements should be covered by namespace 
+     All elements should be covered by namespace

      <literal>http://indexdata.com/yaz</literal> .
      The root element node must be <literal>retrievalinfo</literal>.
     </para>
     <para>
      The <literal>retrievalinfo</literal> must include one or
      <literal>http://indexdata.com/yaz</literal> .
      The root element node must be <literal>retrievalinfo</literal>.
     </para>
     <para>
      The <literal>retrievalinfo</literal> must include one or

-     more <literal>retrieval</literal> elements. Each 
+     more <literal>retrieval</literal> elements. Each

     <literal>retrieval</literal> defines specific combination of
      syntax, name and identifier supported by this retrieval service.
     </para>
     <literal>retrieval</literal> defines specific combination of
      syntax, name and identifier supported by this retrieval service.
     </para>

@@ -2255,7 +2255,7 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
      </variablelist>
     </para>
     <para>
      </variablelist>
     </para>
     <para>

-     The <literal>retrieval</literal> may include one 
+     The <literal>retrieval</literal> may include one

      <literal>backend</literal> element. If a <literal>backend</literal>
      element is given, it specifies how the records are retrieved by
      some backend and how the records are converted from the backend to
      <literal>backend</literal> element. If a <literal>backend</literal>
      element is given, it specifies how the records are retrieved by
      some backend and how the records are converted from the backend to

@@ -2276,8 +2276,8 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
       <varlistentry><term><literal>marc</literal></term>
        <listitem>
         <para>
       <varlistentry><term><literal>marc</literal></term>
        <listitem>
         <para>

-         The <literal>marc</literal> element specifies a conversion 
-         to - and from ISO2709 encoded MARC and 
+         The <literal>marc</literal> element specifies a conversion
+         to - and from ISO2709 encoded MARC and

          <ulink url="&url.marcxml;">&acro.marcxml;</ulink>/MarcXchange.
          The following attributes may be specified:
 
          <ulink url="&url.marcxml;">&acro.marcxml;</ulink>/MarcXchange.
          The following attributes may be specified:
 

@@ -2285,7 +2285,7 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
           <varlistentry><term><literal>inputformat</literal> (REQUIRED)</term>
            <listitem>
             <para>
           <varlistentry><term><literal>inputformat</literal> (REQUIRED)</term>
            <listitem>
             <para>

-             Format of input. Supported values are 
+             Format of input. Supported values are

             <literal>marc</literal> (for ISO2709); and <literal>xml</literal>
              for MARCXML/MarcXchange.
             </para>
             <literal>marc</literal> (for ISO2709); and <literal>xml</literal>
              for MARCXML/MarcXchange.
             </para>

@@ -2295,8 +2295,8 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
           <varlistentry><term><literal>outputformat</literal> (REQUIRED)</term>
            <listitem>
             <para>
           <varlistentry><term><literal>outputformat</literal> (REQUIRED)</term>
            <listitem>
             <para>

-             Format of output. Supported values are 
-            <literal>line</literal> (MARC line format); 
+             Format of output. Supported values are
+            <literal>line</literal> (MARC line format);

             <literal>marcxml</literal> (for MARCXML),
             <literal>marc</literal> (ISO2709),
             <literal>marcxhcange</literal> (for MarcXchange).
             <literal>marcxml</literal> (for MARCXML),
             <literal>marc</literal> (ISO2709),
             <literal>marcxhcange</literal> (for MarcXchange).

@@ -2413,13 +2413,13 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
     <para>
      It should be easy to use the retrieval systems from applications. Refer
      to the headers
     <para>
      It should be easy to use the retrieval systems from applications. Refer
      to the headers

-     <filename>yaz/retrieval.h</filename> and 
+     <filename>yaz/retrieval.h</filename> and

      <filename>yaz/record_conv.h</filename>.
     </para>
    </sect2>
   </sect1>
  </chapter>
      <filename>yaz/record_conv.h</filename>.
     </para>
    </sect2>
   </sect1>
  </chapter>

- 
+

  <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml
  <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml

diff --git a/doc/yaz-asncomp-man.xml b/doc/yaz-asncomp-man.xml
index 1df0fd8..bad62c7 100644 (file)
--- a/doc/yaz-asncomp-man.xml
+++ b/doc/yaz-asncomp-man.xml
@@ -14,18 +14,18 @@
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>

- 
+

  <refmeta>
   <refentrytitle>yaz-asncomp</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>
  <refmeta>
   <refentrytitle>yaz-asncomp</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>

- 
+

  <refnamediv>
   <refname>yaz-asncomp</refname>
   <refpurpose>YAZ ASN.1 compiler</refpurpose>
  </refnamediv>
  <refnamediv>
   <refname>yaz-asncomp</refname>
   <refpurpose>YAZ ASN.1 compiler</refpurpose>
  </refnamediv>

- 
+

  <refsynopsisdiv>
   <cmdsynopsis>
    <command>yaz-asncomp</command>
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>yaz-asncomp</command>

@@ -39,7 +39,7 @@
    <arg choice="opt"><option>-m <replaceable>module</replaceable></option></arg>
    <arg choice="opt">filename</arg>
   </cmdsynopsis>
    <arg choice="opt"><option>-m <replaceable>module</replaceable></option></arg>
    <arg choice="opt">filename</arg>
   </cmdsynopsis>

-  
+

  </refsynopsisdiv>
   <refsect1><title>DESCRIPTION</title>
   <para>
  </refsynopsisdiv>
   <refsect1><title>DESCRIPTION</title>
   <para>

@@ -68,25 +68,25 @@
     <listitem>
      <para>
       Makes the ASN.1 compiler print more verbose about the
     <listitem>
      <para>
       Makes the ASN.1 compiler print more verbose about the

-      various stages of operations. 
+      various stages of operations.

      </para>
     </listitem>
    </varlistentry>
      </para>
     </listitem>
    </varlistentry>

-   
+

    <varlistentry><term><literal>-c </literal>
      <replaceable>cfile</replaceable></term>
     <listitem><para>
       Specifies the name of the C/C++ file with encoders/decoders.
      </para></listitem>
    </varlistentry>
    <varlistentry><term><literal>-c </literal>
      <replaceable>cfile</replaceable></term>
     <listitem><para>
       Specifies the name of the C/C++ file with encoders/decoders.
      </para></listitem>
    </varlistentry>

-   
+

    <varlistentry><term><literal>-h </literal>
      <replaceable>hfile</replaceable></term>
     <listitem><para>
       Specifies the name of header file with definitions.
      </para></listitem>
    </varlistentry>
    <varlistentry><term><literal>-h </literal>
      <replaceable>hfile</replaceable></term>
     <listitem><para>
       Specifies the name of header file with definitions.
      </para></listitem>
    </varlistentry>

-   
+

    <varlistentry><term><literal>-p </literal>
      <replaceable>pfile</replaceable></term>
     <listitem><para>
    <varlistentry><term><literal>-p </literal>
      <replaceable>pfile</replaceable></term>
     <listitem><para>

@@ -95,14 +95,14 @@
       in header file (option -h).
      </para></listitem>
    </varlistentry>
       in header file (option -h).
      </para></listitem>
    </varlistentry>

-   
+

    <varlistentry><term><literal>-d </literal>
      <replaceable>dfile</replaceable></term>
     <listitem><para>
       Specifies the name of a definitions file.
      </para></listitem>
    </varlistentry>
    <varlistentry><term><literal>-d </literal>
      <replaceable>dfile</replaceable></term>
     <listitem><para>
       Specifies the name of a definitions file.
      </para></listitem>
    </varlistentry>

-   
+

    <varlistentry><term><literal>-I </literal>
      <replaceable>iout</replaceable></term>
     <listitem><para>
    <varlistentry><term><literal>-I </literal>
      <replaceable>iout</replaceable></term>
     <listitem><para>

@@ -110,7 +110,7 @@
       are written.
      </para></listitem>
    </varlistentry>
       are written.
      </para></listitem>
    </varlistentry>

-   
+

    <varlistentry><term><literal>-i </literal>
      <replaceable>idir</replaceable></term>
     <listitem><para>
    <varlistentry><term><literal>-i </literal>
      <replaceable>idir</replaceable></term>
     <listitem><para>

@@ -118,7 +118,7 @@
       are written.
      </para></listitem>
    </varlistentry>
       are written.
      </para></listitem>
    </varlistentry>

-   
+

    <varlistentry><term><literal>-m </literal>
      <replaceable>module</replaceable></term>
     <listitem><para>
    <varlistentry><term><literal>-m </literal>
      <replaceable>module</replaceable></term>
     <listitem><para>

@@ -127,7 +127,7 @@
       all modules in the ASN.1 file are processed.
      </para></listitem>
    </varlistentry>
       all modules in the ASN.1 file are processed.
      </para></listitem>
    </varlistentry>

-   
+

   </variablelist>
  </refsect1>
  <refsect1><title>DEFINITIONS FILE</title>
   </variablelist>
  </refsect1>
  <refsect1><title>DEFINITIONS FILE</title>

@@ -144,7 +144,7 @@
   <para>
    Available variables are:
    <variablelist>
   <para>
    Available variables are:
    <variablelist>

-    
+

     <varlistentry><term><literal>default-prefix</literal></term>
      <listitem><para>
        Sets prefix for names in the produced output.
     <varlistentry><term><literal>default-prefix</literal></term>
      <listitem><para>
        Sets prefix for names in the produced output.

@@ -152,7 +152,7 @@
        C typedef prefix and preprocessor prefix respectively.
       </para></listitem>
     </varlistentry>
        C typedef prefix and preprocessor prefix respectively.
       </para></listitem>
     </varlistentry>

-    
+

     <varlistentry><term><literal>prefix(</literal><replaceable>module</replaceable><literal>)</literal></term>
      <listitem><para>
        This value sets prefix values for module
     <varlistentry><term><literal>prefix(</literal><replaceable>module</replaceable><literal>)</literal></term>
      <listitem><para>
        This value sets prefix values for module

@@ -160,24 +160,24 @@
        The value has same form as <literal>default-prefix</literal>.
       </para></listitem>
     </varlistentry>
        The value has same form as <literal>default-prefix</literal>.
       </para></listitem>
     </varlistentry>

-    
+

     <varlistentry><term><literal>filename(</literal><replaceable>module</replaceable><literal>)</literal></term>
      <listitem><para>
        Specifies filename for C/header file for module
        <replaceable>module</replaceable>.
       </para></listitem>
     </varlistentry>
     <varlistentry><term><literal>filename(</literal><replaceable>module</replaceable><literal>)</literal></term>
      <listitem><para>
        Specifies filename for C/header file for module
        <replaceable>module</replaceable>.
       </para></listitem>
     </varlistentry>

-    
+

     <varlistentry><term><literal>init(</literal><replaceable>module</replaceable><literal>,h)</literal></term>
      <listitem><para>
     <varlistentry><term><literal>init(</literal><replaceable>module</replaceable><literal>,h)</literal></term>
      <listitem><para>

-       Code fragment to be put in first part of public header for module 
+       Code fragment to be put in first part of public header for module

     <replaceable>module</replaceable>.
       </para></listitem>
     </varlistentry>
     <replaceable>module</replaceable>.
       </para></listitem>
     </varlistentry>

-    
+

     <varlistentry><term><literal>body(</literal><replaceable>module</replaceable><literal>,h)</literal></term>
      <listitem><para>
     <varlistentry><term><literal>body(</literal><replaceable>module</replaceable><literal>,h)</literal></term>
      <listitem><para>

-       Code fragment to be put in last part of public header for module 
+       Code fragment to be put in last part of public header for module

     <replaceable>module</replaceable> (trailer).
       </para></listitem>
     </varlistentry>
     <replaceable>module</replaceable> (trailer).
       </para></listitem>
     </varlistentry>

@@ -188,21 +188,21 @@
        module <replaceable>module</replaceable>.
       </para></listitem>
     </varlistentry>
        module <replaceable>module</replaceable>.
       </para></listitem>
     </varlistentry>

-    
+

     <varlistentry><term><literal>body(</literal><replaceable>module</replaceable><literal>,c)</literal></term>
      <listitem><para>
        Code fragment to be put in last part of C based encoder/decoder for
        module <replaceable>module</replaceable> (trailer).
       </para></listitem>
     </varlistentry>
     <varlistentry><term><literal>body(</literal><replaceable>module</replaceable><literal>,c)</literal></term>
      <listitem><para>
        Code fragment to be put in last part of C based encoder/decoder for
        module <replaceable>module</replaceable> (trailer).
       </para></listitem>
     </varlistentry>

-    
+

     <varlistentry><term><literal>map(</literal><replaceable>module</replaceable><literal>,</literal><replaceable>name</replaceable><literal>)</literal></term>
      <listitem><para>
     <varlistentry><term><literal>map(</literal><replaceable>module</replaceable><literal>,</literal><replaceable>name</replaceable><literal>)</literal></term>
      <listitem><para>

-       Maps ASN.1 type in module <replaceable>module</replaceable> 
+       Maps ASN.1 type in module <replaceable>module</replaceable>

        of <replaceable>name</replaceable> to value.
       </para></listitem>
     </varlistentry>
        of <replaceable>name</replaceable> to value.
       </para></listitem>
     </varlistentry>

-    
+

     <varlistentry><term><literal>membermap(</literal><replaceable>module</replaceable><literal>,</literal><replaceable>name</replaceable><literal>,</literal><replaceable>member</replaceable><literal>)</literal></term>
      <listitem><para>
        Maps member <replaceable>member</replaceable> in SEQUENCE/CHOICE of
     <varlistentry><term><literal>membermap(</literal><replaceable>module</replaceable><literal>,</literal><replaceable>name</replaceable><literal>,</literal><replaceable>member</replaceable><literal>)</literal></term>
      <listitem><para>
        Maps member <replaceable>member</replaceable> in SEQUENCE/CHOICE of

@@ -215,7 +215,7 @@
        C <literal>struct</literal>,<literal>union</literal>.
       </para></listitem>
     </varlistentry>
        C <literal>struct</literal>,<literal>union</literal>.
       </para></listitem>
     </varlistentry>

-    
+

     <varlistentry><term><literal>unionmap(</literal><replaceable>module</replaceable><literal>,</literal><replaceable>name</replaceable><literal>,</literal><replaceable>member</replaceable><literal>)</literal></term>
      <listitem><para>
        Maps member <replaceable>member</replaceable> in CHOICE of
     <varlistentry><term><literal>unionmap(</literal><replaceable>module</replaceable><literal>,</literal><replaceable>name</replaceable><literal>,</literal><replaceable>member</replaceable><literal>)</literal></term>
      <listitem><para>
        Maps member <replaceable>member</replaceable> in CHOICE of

diff --git a/doc/yaz-client-commands.xml b/doc/yaz-client-commands.xml
index dbd3c2d..4865a4d 100644 (file)
--- a/doc/yaz-client-commands.xml
+++ b/doc/yaz-client-commands.xml
@@ -1,4 +1,4 @@
-<!-- 
+<!--

    Commands for YAZ client.
    Included in both manual and man page for yaz-client.
 -->
    Commands for YAZ client.
    Included in both manual and man page for yaz-client.
 -->

@@ -149,7 +149,7 @@
     If no <literal>=</literal> is in the criterion it is treated as a
     sortfield of type InternationalString.
     The flags word of each sort specification must consist of
     If no <literal>=</literal> is in the criterion it is treated as a
     sortfield of type InternationalString.
     The flags word of each sort specification must consist of

-    <literal>s</literal> 
+    <literal>s</literal>

     for case sensitive or <literal>i</literal> for case insensitive, and
     <literal>&lt;</literal> for ascending order or <literal>&gt;</literal>
     for descending order.
     for case sensitive or <literal>i</literal> for case insensitive, and
     <literal>&lt;</literal> for ascending order or <literal>&gt;</literal>
     for descending order.

@@ -171,7 +171,7 @@
   <listitem>
    <para>Sets up a authentication string if a server requires
     authentication (v2 OpenStyle). The authentication string is first
   <listitem>
    <para>Sets up a authentication string if a server requires
     authentication (v2 OpenStyle). The authentication string is first

-    sent to the server when the 
+    sent to the server when the

     <link linkend="command-open"><literal>open</literal></link> command is
     issued and the Z39.50 Initialize Request is sent, so this command
     must be used before <literal>open</literal> in order to be effective.
     <link linkend="command-open"><literal>open</literal></link> command is
     issued and the Z39.50 Initialize Request is sent, so this command
     must be used before <literal>open</literal> in order to be effective.

@@ -191,7 +191,7 @@
     <literal>GET</literal>, <literal>SOAP</literal> (default)
     or <literal>SOLR</literal>. Version
     should be either 1.1 or 1.2 for SRU. Other versions are allowed - for testing
     <literal>GET</literal>, <literal>SOAP</literal> (default)
     or <literal>SOLR</literal>. Version
     should be either 1.1 or 1.2 for SRU. Other versions are allowed - for testing

-    purposes (version negotiation with SRU server). 
+    purposes (version negotiation with SRU server).

     The version is currently not used for SOLR Web Services
    </para>
   </listitem>
     The version is currently not used for SOLR Web Services
    </para>
   </listitem>

@@ -205,7 +205,7 @@
    </para>
   </listitem>
  </varlistentry>
    </para>
   </listitem>
  </varlistentry>

- 
+

  <varlistentry><term>
    <literal>lslb</literal> <replaceable>n</replaceable>
   </term>
  <varlistentry><term>
    <literal>lslb</literal> <replaceable>n</replaceable>
   </term>

@@ -236,7 +236,7 @@
    </para>
   </listitem>
  </varlistentry>
    </para>
   </listitem>
  </varlistentry>

- 
+

  <varlistentry><term>
    <literal>mspn</literal> <replaceable>n</replaceable>
   </term>
  <varlistentry><term>
    <literal>mspn</literal> <replaceable>n</replaceable>
   </term>

@@ -315,7 +315,7 @@
    <literal>querytype</literal> <replaceable>type</replaceable>
   </term>
   <listitem>
    <literal>querytype</literal> <replaceable>type</replaceable>
   </term>
   <listitem>

-   <para>Sets the query type as used by command 
+   <para>Sets the query type as used by command

    <link linkend="command-find"><literal>find</literal></link>.
     The following is supported:
     <literal>prefix</literal> for
    <link linkend="command-find"><literal>find</literal></link>.
     The following is supported:
     <literal>prefix</literal> for

@@ -351,7 +351,7 @@
    <replaceable>type</replaceable> <replaceable>no</replaceable>
   </term>
   <listitem>
    <replaceable>type</replaceable> <replaceable>no</replaceable>
   </term>
   <listitem>

-   <para>Sends an Item Order Request using the ILL External. 
+   <para>Sends an Item Order Request using the ILL External.

     <replaceable>type</replaceable> is either 1 or 2 which corresponds to
     ILL-Profile 1 and 2 respectively. The <replaceable>no</replaceable>
     is the Result Set position of the record to be ordered.
     <replaceable>type</replaceable> is either 1 or 2 which corresponds to
     ILL-Profile 1 and 2 respectively. The <replaceable>no</replaceable>
     is the Result Set position of the record to be ordered.

@@ -368,10 +368,10 @@
    <para>Sends Item Update Request. The <replaceable>action</replaceable>
     argument must be the action type: one of <literal>insert</literal>,
     <literal>replace</literal>, <literal>delete</literal> and
    <para>Sends Item Update Request. The <replaceable>action</replaceable>
     argument must be the action type: one of <literal>insert</literal>,
     <literal>replace</literal>, <literal>delete</literal> and

-    <literal>update</literal>. The second argument, 
+    <literal>update</literal>. The second argument,

     <replaceable>recid</replaceable>, is the
     record identifier (any string). Third argument which is optional is
     <replaceable>recid</replaceable>, is the
     record identifier (any string). Third argument which is optional is

-    the record document for the request. If doc is preceded with 
+    the record document for the request. If doc is preceded with

     "&lt;", then the following characters are treated as a filename
     with the records to be updated. Otherwise doc is treated as
     a document itself. The doc may also be quited in double quotes.
     "&lt;", then the following characters are treated as a filename
     with the records to be updated. Otherwise doc is treated as
     a document itself. The doc may also be quited in double quotes.

@@ -456,7 +456,7 @@
    By default YAZ client waits (on) for response packages immediately
    after a command (find, show) has been issued. If <literal>off</literal>
    is used, YAZ client does not attempt to receive packages automatically.
    By default YAZ client waits (on) for response packages immediately
    after a command (find, show) has been issued. If <literal>off</literal>
    is used, YAZ client does not attempt to receive packages automatically.

-   These will have to be manually received when command 
+   These will have to be manually received when command

    <link linkend="command-wait-response">
     <literal>wait_response</literal>
    </link> is used.
    <link linkend="command-wait-response">
     <literal>wait_response</literal>
    </link> is used.

@@ -559,7 +559,7 @@
   </term>
   <listitem>
    <para>Specifies character set for output (display). The
   </term>
   <listitem>
    <para>Specifies character set for output (display). The

-    argument is the same as second argument for command 
+    argument is the same as second argument for command

     <link linkend="command-charset"><literal>charset</literal></link>.
    </para>
   </listitem>
     <link linkend="command-charset"><literal>charset</literal></link>.
    </para>
   </listitem>

@@ -594,7 +594,7 @@
    </para>
   </listitem>
  </varlistentry>
    </para>
   </listitem>
  </varlistentry>

- 
+

  <varlistentry><term>
    <literal>set_cclfile</literal>
    <replaceable>filename</replaceable>
  <varlistentry><term>
    <literal>set_cclfile</literal>
    <replaceable>filename</replaceable>

@@ -676,7 +676,7 @@
   <listitem>
    <para>This command makes YAZ client wait for a number of
     response packages from target. If <replaceable>number</replaceable> is
   <listitem>
    <para>This command makes YAZ client wait for a number of
     response packages from target. If <replaceable>number</replaceable> is

-    omitted, 1 is assumed. 
+    omitted, 1 is assumed.

    </para>
    <para>This command is rarely used and is only useful if command
     <link linkend="command-set-auto-wait">
    </para>
    <para>This command is rarely used and is only useful if command
     <link linkend="command-set-auto-wait">

@@ -702,8 +702,8 @@
    <replaceable>ver</replaceable>
   </term>
   <listitem>
    <replaceable>ver</replaceable>
   </term>
   <listitem>

-   <para>This command sets Z39.50 version for negotiation. 
-    Should be used before 
+   <para>This command sets Z39.50 version for negotiation.
+    Should be used before

     <link linkend="command-open"><literal>open</literal></link>.
     By default 3 (version 3) is used.
    </para>
     <link linkend="command-open"><literal>open</literal></link>.
     By default 3 (version 3) is used.
    </para>

@@ -715,37 +715,37 @@
    <replaceable>op1 op2..</replaceable>
   </term>
   <listitem>
    <replaceable>op1 op2..</replaceable>
   </term>
   <listitem>

-   <para>This command sets Z39.50 options for negotiation. 
-    Should be used before 
+   <para>This command sets Z39.50 options for negotiation.
+    Should be used before

    <link linkend="command-open"><literal>open</literal></link>.
    </para>
    <para>
     The following options are supported:
    <link linkend="command-open"><literal>open</literal></link>.
    </para>
    <para>
     The following options are supported:

-    <literal>search</literal>,  
-    <literal>present</literal>,  
-    <literal>delSet</literal>,  
-    <literal>resourceReport</literal>,  
-    <literal>triggerResourceCtrl</literal>,  
-    <literal>resourceCtrl</literal>,  
-    <literal>accessCtrl</literal>,  
-    <literal>scan</literal>,  
-    <literal>sort</literal>,  
-    <literal>extendedServices</literal>,  
-    <literal>level_1Segmentation</literal>,  
-    <literal>level_2Segmentation</literal>,  
-    <literal>concurrentOperations</literal>,  
-    <literal>namedResultSets</literal>,  
-    <literal>encapsulation</literal>,  
-    <literal>resultCount</literal>,  
-    <literal>negotiationModel</literal>,  
-    <literal>duplicationDetection</literal>,  
-    <literal>queryType104</literal>,  
-    <literal>pQESCorrection</literal>,  
+    <literal>search</literal>,
+    <literal>present</literal>,
+    <literal>delSet</literal>,
+    <literal>resourceReport</literal>,
+    <literal>triggerResourceCtrl</literal>,
+    <literal>resourceCtrl</literal>,
+    <literal>accessCtrl</literal>,
+    <literal>scan</literal>,
+    <literal>sort</literal>,
+    <literal>extendedServices</literal>,
+    <literal>level_1Segmentation</literal>,
+    <literal>level_2Segmentation</literal>,
+    <literal>concurrentOperations</literal>,
+    <literal>namedResultSets</literal>,
+    <literal>encapsulation</literal>,
+    <literal>resultCount</literal>,
+    <literal>negotiationModel</literal>,
+    <literal>duplicationDetection</literal>,
+    <literal>queryType104</literal>,
+    <literal>pQESCorrection</literal>,

     <literal>stringSchema</literal>.
    </para>
   </listitem>
  </varlistentry>
     <literal>stringSchema</literal>.
    </para>
   </listitem>
  </varlistentry>

- 
+

 </variablelist>
 <!-- Keep this comment at the end of the file
 Local variables:
 </variablelist>
 <!-- Keep this comment at the end of the file
 Local variables:

diff --git a/doc/yaz-client-man.xml b/doc/yaz-client-man.xml
index d519970..b097a34 100644 (file)
--- a/doc/yaz-client-man.xml
+++ b/doc/yaz-client-man.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN" 
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN"

  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
 [
      <!ENTITY % local SYSTEM "local.ent">
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
 [
      <!ENTITY % local SYSTEM "local.ent">

@@ -14,13 +14,13 @@
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>

- 
+

  <refmeta>
   <refentrytitle>yaz-client</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>
  <refmeta>
   <refentrytitle>yaz-client</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>

- 
+

  <refnamediv>
   <refname>yaz-client</refname>
   <refpurpose>Z39.50/SRU client for implementors</refpurpose>
  <refnamediv>
   <refname>yaz-client</refname>
   <refpurpose>Z39.50/SRU client for implementors</refpurpose>

@@ -47,7 +47,7 @@
   </cmdsynopsis>
 
  </refsynopsisdiv>
   </cmdsynopsis>
 
  </refsynopsisdiv>

-  
+

  <refsect1><title>DESCRIPTION</title>
   <para>
    <command>yaz-client</command> is a
  <refsect1><title>DESCRIPTION</title>
   <para>
    <command>yaz-client</command> is a

@@ -69,7 +69,7 @@
    commands from one of the following files:
    <itemizedlist>
     <listitem><para>
    commands from one of the following files:
    <itemizedlist>
     <listitem><para>

-      Command file if it is given by option -f. 
+      Command file if it is given by option -f.

      </para></listitem>
     <listitem><para>
       <filename>.yazclientrc</filename> in current working directory.
      </para></listitem>
     <listitem><para>
       <filename>.yazclientrc</filename> in current working directory.

@@ -114,9 +114,9 @@
     <varlistentry>
      <term>-d <replaceable>dump</replaceable></term>
      <listitem><para>
     <varlistentry>
      <term>-d <replaceable>dump</replaceable></term>
      <listitem><para>

-       If specified, YAZ will dump BER data for all PDUs sent and received 
+       If specified, YAZ will dump BER data for all PDUs sent and received

        to individual files, named
        to individual files, named

-       <replaceable>dump</replaceable>.DDD.<literal>raw</literal>, 
+       <replaceable>dump</replaceable>.DDD.<literal>raw</literal>,

        where DDD is 001, 002, 003, ..
       </para></listitem>
     </varlistentry>
        where DDD is 001, 002, 003, ..
       </para></listitem>
     </varlistentry>

@@ -148,7 +148,7 @@
      <listitem><para>
        If specified, the client will use the proxy at the address
        given. YAZ client will
      <listitem><para>
        If specified, the client will use the proxy at the address
        given. YAZ client will

-       connect to a proxy on the address and port given. 
+       connect to a proxy on the address and port given.

        The actual target will be specified as part of the InitRequest
        to inform the proxy about actual target.
       </para></listitem>
        The actual target will be specified as part of the InitRequest
        to inform the proxy about actual target.
       </para></listitem>

@@ -164,7 +164,7 @@
      <term>-t <replaceable>displaycharset</replaceable></term>
      <listitem><para>
        If displaycharset is given, it specifies name of the character set of the
      <term>-t <replaceable>displaycharset</replaceable></term>
      <listitem><para>
        If displaycharset is given, it specifies name of the character set of the

-       output (on the terminal on which YAZ client is running). 
+       output (on the terminal on which YAZ client is running).

       </para></listitem>
     </varlistentry>
     <varlistentry>
       </para></listitem>
     </varlistentry>
     <varlistentry>

@@ -179,7 +179,7 @@
      </term><listitem>
       <simpara>Sets the LOG level to <replaceable>level</replaceable>.
        Level is a sequence of tokens separated by comma. Each token
      </term><listitem>
       <simpara>Sets the LOG level to <replaceable>level</replaceable>.
        Level is a sequence of tokens separated by comma. Each token

-       is a integer or a named LOG item - one of 
+       is a integer or a named LOG item - one of

        <literal>fatal</literal>,
        <literal>debug</literal>,
        <literal>warn</literal>,
        <literal>fatal</literal>,
        <literal>debug</literal>,
        <literal>warn</literal>,

diff --git a/doc/yaz-config-man.xml b/doc/yaz-config-man.xml
index 1b16139..4e8468a 100644 (file)
--- a/doc/yaz-config-man.xml
+++ b/doc/yaz-config-man.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"

-[ 
+[

      <!ENTITY % local SYSTEM "local.ent">
      %local;
      <!ENTITY % entities SYSTEM "entities.ent">
      <!ENTITY % local SYSTEM "local.ent">
      %local;
      <!ENTITY % entities SYSTEM "entities.ent">

@@ -14,18 +14,18 @@
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>

- 
+

  <refmeta>
   <refentrytitle>yaz-config</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>
  <refmeta>
   <refentrytitle>yaz-config</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>

- 
+

  <refnamediv>
   <refname>yaz-config</refname>
   <refpurpose>Script to get information about YAZ.</refpurpose>
  </refnamediv>
  <refnamediv>
   <refname>yaz-config</refname>
   <refpurpose>Script to get information about YAZ.</refpurpose>
  </refnamediv>

- 
+

  <refsynopsisdiv>
   <cmdsynopsis>
    <command>yaz-config</command>
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>yaz-config</command>

@@ -40,7 +40,7 @@
    <arg choice="opt" rep="repeat">libraries</arg>
   </cmdsynopsis>
  </refsynopsisdiv>
    <arg choice="opt" rep="repeat">libraries</arg>
   </cmdsynopsis>
  </refsynopsisdiv>

- 
+

  <refsect1><title>DESCRIPTION</title>
   <para>
    <command>yaz-config</command> is a script that returns information
  <refsect1><title>DESCRIPTION</title>
   <para>
    <command>yaz-config</command> is a script that returns information

@@ -59,11 +59,11 @@
      </para></listitem>
    </varlistentry>
   </variablelist>
      </para></listitem>
    </varlistentry>
   </variablelist>

-  
+

  </refsect1>
  </refsect1>

- 
+

  <refsect1><title>OPTIONS</title>
  <refsect1><title>OPTIONS</title>

-  
+

   <variablelist>
    <varlistentry>
     <term>--prefix[=<replaceable>DIR</replaceable>]</term>
   <variablelist>
    <varlistentry>
     <term>--prefix[=<replaceable>DIR</replaceable>]</term>

@@ -124,7 +124,7 @@
 
   </variablelist>
  </refsect1>
 
   </variablelist>
  </refsect1>

- 
+

  <refsect1><title>FILES</title>
   <para>
    <filename>&prefix;/bin/yaz-config</filename>
  <refsect1><title>FILES</title>
   <para>
    <filename>&prefix;/bin/yaz-config</filename>

diff --git a/doc/yaz-iconv-man.xml b/doc/yaz-iconv-man.xml
index e86c367..537e821 100644 (file)
--- a/doc/yaz-iconv-man.xml
+++ b/doc/yaz-iconv-man.xml
@@ -14,18 +14,18 @@
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>

- 
+

  <refmeta>
   <refentrytitle>yaz-iconv</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>
  <refmeta>
   <refentrytitle>yaz-iconv</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>

- 
+

  <refnamediv>
   <refname>yaz-iconv</refname>
   <refpurpose>YAZ Character set conversion utility</refpurpose>
  </refnamediv>
  <refnamediv>
   <refname>yaz-iconv</refname>
   <refpurpose>YAZ Character set conversion utility</refpurpose>
  </refnamediv>

- 
+

  <refsynopsisdiv>
   <cmdsynopsis>
    <command>yaz-iconv</command>
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>yaz-iconv</command>

@@ -35,7 +35,7 @@
    <arg choice="opt" rep="repeat">file</arg>
   </cmdsynopsis>
  </refsynopsisdiv>
    <arg choice="opt" rep="repeat">file</arg>
   </cmdsynopsis>
  </refsynopsisdiv>

- 
+

  <refsect1><title>DESCRIPTION</title>
   <para>
    <command>yaz-iconv</command> converts data in file in character
  <refsect1><title>DESCRIPTION</title>
   <para>
    <command>yaz-iconv</command> converts data in file in character

@@ -51,9 +51,9 @@
    <command>yaz-iconv</command> reads from standard input.
   </para>
  </refsect1>
    <command>yaz-iconv</command> reads from standard input.
   </para>
  </refsect1>

- 
+

  <refsect1><title>OPTIONS</title>
  <refsect1><title>OPTIONS</title>

-  
+

   <variablelist>
    <varlistentry>
     <term>-f<replaceable>from</replaceable>]</term>
   <variablelist>
    <varlistentry>
     <term>-f<replaceable>from</replaceable>]</term>

@@ -82,7 +82,7 @@
 
   </variablelist>
  </refsect1>
 
   </variablelist>
  </refsect1>

- 
+

  <refsect1><title>ENCODINGS</title>
   <para>
    The yaz-iconv command and the API as defined in
  <refsect1><title>ENCODINGS</title>
   <para>
    The yaz-iconv command and the API as defined in

@@ -191,7 +191,7 @@
     yaz-iconv -f ISO-8859-1 -t UTF-8 -X &lt;input.lst &gt;output.lst
    </screen>
   </para>
     yaz-iconv -f ISO-8859-1 -t UTF-8 -X &lt;input.lst &gt;output.lst
    </screen>
   </para>

- </refsect1> 
+ </refsect1>

 
  <refsect1><title>FILES</title>
   <para>
 
  <refsect1><title>FILES</title>
   <para>

diff --git a/doc/yaz-icu-man.xml b/doc/yaz-icu-man.xml
index 7c016bf..bf93672 100644 (file)
--- a/doc/yaz-icu-man.xml
+++ b/doc/yaz-icu-man.xml
@@ -14,13 +14,13 @@
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>

- 
+

  <refmeta>
   <refentrytitle>yaz-icu</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>
  <refmeta>
   <refentrytitle>yaz-icu</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>

- 
+

  <refnamediv>
   <refname>yaz-icu</refname>
   <refpurpose>YAZ ICU utility</refpurpose>
  <refnamediv>
   <refname>yaz-icu</refname>
   <refpurpose>YAZ ICU utility</refpurpose>

@@ -36,10 +36,10 @@
    <arg choice="opt">infile</arg>
   </cmdsynopsis>
  </refsynopsisdiv>
    <arg choice="opt">infile</arg>
   </cmdsynopsis>
  </refsynopsisdiv>

- 
+

  <refsect1><title>DESCRIPTION</title>
   <para>
  <refsect1><title>DESCRIPTION</title>
   <para>

-   <command>yaz-icu</command> is utility which demonstrates 
+   <command>yaz-icu</command> is utility which demonstrates

    the ICU chain module of yaz. (<filename>yaz/icu.h</filename>).
   </para>
   <para>
    the ICU chain module of yaz. (<filename>yaz/icu.h</filename>).
   </para>
   <para>

@@ -70,7 +70,7 @@
     <listitem><para>
       Specifies extra information to be printed about the ICU system.
       If <replaceable>type</replaceable> is <literal>c</literal>
     <listitem><para>
       Specifies extra information to be printed about the ICU system.
       If <replaceable>type</replaceable> is <literal>c</literal>

-      then ICU converters are printed. 
+      then ICU converters are printed.

       If <replaceable>type</replaceable> is <literal>l</literal>
       available locales are printed.
       If <replaceable>type</replaceable> is <literal>t</literal>
       If <replaceable>type</replaceable> is <literal>l</literal>
       available locales are printed.
       If <replaceable>type</replaceable> is <literal>t</literal>

@@ -116,7 +116,7 @@
   </para>
   <para>
    The following conversion elements are available:
   </para>
   <para>
    The following conversion elements are available:

-   
+

    <variablelist>
     <varlistentry>
      <term>casemap</term>
    <variablelist>
     <varlistentry>
      <term>casemap</term>

@@ -137,7 +137,7 @@
          <para>Upper case using ICU function u_strToUpper.</para>
         </listitem>
        </varlistentry>
          <para>Upper case using ICU function u_strToUpper.</para>
         </listitem>
        </varlistentry>

-       
+

        <varlistentry>
         <term>t</term>
         <listitem>
        <varlistentry>
         <term>t</term>
         <listitem>

@@ -151,7 +151,7 @@
          <para>Fold case using ICU function u_strFoldCase.</para>
         </listitem>
        </varlistentry>
          <para>Fold case using ICU function u_strFoldCase.</para>
         </listitem>
        </varlistentry>

-       
+

        </variablelist>
       </para></listitem>
     </varlistentry>
        </variablelist>
       </para></listitem>
     </varlistentry>

@@ -164,7 +164,7 @@
        using function icu_chain_token_display (<filename>yaz/icu.h</filename>).
       </para></listitem>
     </varlistentry>
        using function icu_chain_token_display (<filename>yaz/icu.h</filename>).
       </para></listitem>
     </varlistentry>

-    
+

     <varlistentry>
      <term>transform</term>
      <listitem><para>
     <varlistentry>
      <term>transform</term>
      <listitem><para>

@@ -175,7 +175,7 @@
        more information.
       </para></listitem>
     </varlistentry>
        more information.
       </para></listitem>
     </varlistentry>

-    
+

     <varlistentry>
      <term>transliterate</term>
      <listitem><para>
     <varlistentry>
      <term>transliterate</term>
      <listitem><para>

@@ -185,7 +185,7 @@
        more information.
       </para></listitem>
     </varlistentry>
        more information.
       </para></listitem>
     </varlistentry>

-    
+

     <varlistentry>
      <term>tokenize</term>
      <listitem><para>
     <varlistentry>
      <term>tokenize</term>
      <listitem><para>

@@ -206,7 +206,7 @@
          <para>Sentence. ICU: UBRK_SENTENCE.</para>
         </listitem>
        </varlistentry>
          <para>Sentence. ICU: UBRK_SENTENCE.</para>
         </listitem>
        </varlistentry>

-       
+

        <varlistentry>
         <term>w</term>
         <listitem>
        <varlistentry>
         <term>w</term>
         <listitem>

@@ -231,9 +231,9 @@
        </variablelist>
       </para></listitem>
     </varlistentry>
        </variablelist>
       </para></listitem>
     </varlistentry>

-    
+

    </variablelist>
    </variablelist>

-   
+

   </para>
  </refsect1>
  <refsect1><title>EXAMPLES</title>
   </para>
  </refsect1>
  <refsect1><title>EXAMPLES</title>

diff --git a/doc/yaz-illclient-man.xml b/doc/yaz-illclient-man.xml
index 631594b..82b04f1 100644 (file)
--- a/doc/yaz-illclient-man.xml
+++ b/doc/yaz-illclient-man.xml
@@ -14,18 +14,18 @@
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>

- 
+

  <refmeta>
   <refentrytitle>yaz-illclient</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>
  <refmeta>
   <refentrytitle>yaz-illclient</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>

- 
+

  <refnamediv>
   <refname>yaz-illclient</refname>
   <refpurpose>ILL client</refpurpose>
  </refnamediv>
  <refnamediv>
   <refname>yaz-illclient</refname>
   <refpurpose>ILL client</refpurpose>
  </refnamediv>

- 
+

  <refsynopsisdiv>
   <cmdsynopsis>
    <command>yaz-illclient</command>
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>yaz-illclient</command>

@@ -34,12 +34,12 @@
    <arg choice="opt" rep="repeat"><option>-D</option> <replaceable>name=value</replaceable></arg>
    <arg choice="opt"><option>-o</option></arg>
    <arg choice="opt"><option>-u <replaceable>user</replaceable></option></arg>
    <arg choice="opt" rep="repeat"><option>-D</option> <replaceable>name=value</replaceable></arg>
    <arg choice="opt"><option>-o</option></arg>
    <arg choice="opt"><option>-u <replaceable>user</replaceable></option></arg>

-   <arg choice="opt"><option>-p <replaceable>password</replaceable></option></arg>   
+   <arg choice="opt"><option>-p <replaceable>password</replaceable></option></arg>

    <arg choice="opt"><option>-V</option></arg>
    <arg choice="opt">server-addr</arg>
   </cmdsynopsis>
  </refsynopsisdiv>
    <arg choice="opt"><option>-V</option></arg>
    <arg choice="opt">server-addr</arg>
   </cmdsynopsis>
  </refsynopsisdiv>

- 
+

  <refsect1><title>DESCRIPTION</title>
   <para>
    <command>yaz-illclient</command> is an client which sends an ISO
  <refsect1><title>DESCRIPTION</title>
   <para>
    <command>yaz-illclient</command> is an client which sends an ISO

@@ -48,9 +48,9 @@
    must be specified.
   </para>
  </refsect1>
    must be specified.
   </para>
  </refsect1>

- 
+

  <refsect1><title>OPTIONS</title>
  <refsect1><title>OPTIONS</title>

-  
+

   <variablelist>
    <varlistentry>
     <term>-f <replaceable>filename</replaceable>]</term>
   <variablelist>
    <varlistentry>
     <term>-f <replaceable>filename</replaceable>]</term>

@@ -108,7 +108,7 @@
   <para>
    None yet.
   </para>
   <para>
    None yet.
   </para>

- </refsect1> 
+ </refsect1>

 
  <refsect1><title>FILES</title>
   <para>
 
  <refsect1><title>FILES</title>
   <para>

diff --git a/doc/yaz-json-parse-man.xml b/doc/yaz-json-parse-man.xml
index 3e84dc7..8a6951e 100644 (file)
--- a/doc/yaz-json-parse-man.xml
+++ b/doc/yaz-json-parse-man.xml
@@ -14,13 +14,13 @@
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>

- 
+

  <refmeta>
   <refentrytitle>yaz-json-parse</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>
  <refmeta>
   <refentrytitle>yaz-json-parse</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>

- 
+

  <refnamediv>
   <refname>yaz-json-parse</refname>
   <refpurpose>YAZ JSON parser</refpurpose>
  <refnamediv>
   <refname>yaz-json-parse</refname>
   <refpurpose>YAZ JSON parser</refpurpose>

@@ -32,10 +32,10 @@
    <arg>-p</arg>
   </cmdsynopsis>
  </refsynopsisdiv>
    <arg>-p</arg>
   </cmdsynopsis>
  </refsynopsisdiv>

- 
+

  <refsect1><title>DESCRIPTION</title>
   <para>
  <refsect1><title>DESCRIPTION</title>
   <para>

-   <command>yaz-json-parse</command> is utility which demonstrates 
+   <command>yaz-json-parse</command> is utility which demonstrates

    the JSON API of YAZ. (<filename>yaz/json.h</filename>).
   </para>
   <para>
    the JSON API of YAZ. (<filename>yaz/json.h</filename>).
   </para>
   <para>

diff --git a/doc/yaz-log-man.xml b/doc/yaz-log-man.xml
index 2aaec9c..abf9ccf 100644 (file)
--- a/doc/yaz-log-man.xml
+++ b/doc/yaz-log-man.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"

-[ 
+[

      <!ENTITY % local SYSTEM "local.ent">
      %local;
      <!ENTITY % entities SYSTEM "entities.ent">
      <!ENTITY % local SYSTEM "local.ent">
      %local;
      <!ENTITY % entities SYSTEM "entities.ent">

@@ -14,18 +14,18 @@
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>

- 
+

  <refmeta>
   <refentrytitle>yaz-log</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo class="manual">Conventions and miscellaneous</refmiscinfo>
  </refmeta>
  <refmeta>
   <refentrytitle>yaz-log</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo class="manual">Conventions and miscellaneous</refmiscinfo>
  </refmeta>

- 
+

  <refnamediv>
   <refname>yaz-log</refname>
   <refpurpose>Log handling in all yaz-based programs</refpurpose>
  </refnamediv>
  <refnamediv>
   <refname>yaz-log</refname>
   <refpurpose>Log handling in all yaz-based programs</refpurpose>
  </refnamediv>

- 
+

  <refsynopsisdiv>
   <cmdsynopsis>
    <command>yaz-XXXX</command>
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>yaz-XXXX</command>

@@ -33,7 +33,7 @@
    <arg choice="opt"><option>-l <replaceable>logfile</replaceable></option></arg>
   </cmdsynopsis>
  </refsynopsisdiv>
    <arg choice="opt"><option>-l <replaceable>logfile</replaceable></option></arg>
   </cmdsynopsis>
  </refsynopsisdiv>

- 
+

  <refsect1><title>DESCRIPTION</title>
   <para>
    All YAZ-based programs use a common log subsystem, and should support
  <refsect1><title>DESCRIPTION</title>
   <para>
    All YAZ-based programs use a common log subsystem, and should support

@@ -43,9 +43,9 @@
   <para>
   </para>
  </refsect1>
   <para>
   </para>
  </refsect1>

- 
+

  <refsect1><title>OPTIONS</title>
  <refsect1><title>OPTIONS</title>

-  
+

   <variablelist>
    <varlistentry>
     <term>-l<replaceable> logfile</replaceable></term>
   <variablelist>
    <varlistentry>
     <term>-l<replaceable> logfile</replaceable></term>

@@ -55,7 +55,7 @@
       <filename>stderr</filename> is used. The log is appended to this file.
       If the file grows overly large, it is silently rotated: It is renamed to
       <replaceable>logfile</replaceable>.1,
       <filename>stderr</filename> is used. The log is appended to this file.
       If the file grows overly large, it is silently rotated: It is renamed to
       <replaceable>logfile</replaceable>.1,

-      <replaceable>logfile</replaceable>.2, .., 9 
+      <replaceable>logfile</replaceable>.2, .., 9

       (old such file is deleted), and a
       new file is opened. The limit defaults to 1GB, but can be set by the
       program.
       (old such file is deleted), and a
       new file is opened. The limit defaults to 1GB, but can be set by the
       program.

@@ -88,7 +88,7 @@
 
  <refsect1><title>LOG LEVELS TO CONTROL LOGGING</title>
   <para>
 
  <refsect1><title>LOG LEVELS TO CONTROL LOGGING</title>
   <para>

-   Some of the log levels control the way the log is written. 
+   Some of the log levels control the way the log is written.

   </para>
   <para>
    <literal>flush</literal> causes the log to be flushed after every write.
   </para>
   <para>
    <literal>flush</literal> causes the log to be flushed after every write.

@@ -102,8 +102,8 @@
    intended for automatic test scripts, which should produce predictable log
    files that are easy to compare.
   </para>
    intended for automatic test scripts, which should produce predictable log
    files that are easy to compare.
   </para>

-  
- </refsect1> 
+
+ </refsect1>

 
  <refsect1><title>GENERAL LOG LEVELS IN YAZ ITSELF</title>
   <para>
 
  <refsect1><title>GENERAL LOG LEVELS IN YAZ ITSELF</title>
   <para>

@@ -123,7 +123,7 @@
    levels (see below).
   </para>
   <para>
    levels (see below).
   </para>
   <para>

-   <literal>all</literal> turns on almost all hard-coded log levels. 
+   <literal>all</literal> turns on almost all hard-coded log levels.

   </para>
   <para>
    <literal>loglevel</literal> logs information about the log levels used by
   </para>
   <para>
    <literal>loglevel</literal> logs information about the log levels used by

@@ -135,28 +135,28 @@
    is to grep for <function>yaz_log_module_level</function> in the source
    code, as in
    <screen>
    is to grep for <function>yaz_log_module_level</function> in the source
    code, as in
    <screen>

-      find . -name '*.[ch]' -print | 
-         xargs grep yaz_log_module_level | 
+      find . -name '*.[ch]' -print |
+         xargs grep yaz_log_module_level |

          grep '"' |
          grep '"' |

-         cut -d'"' -f2 | 
-         sort -u   
+         cut -d'"' -f2 |
+         sort -u

    </screen>
   </para>
   <para>
    </screen>
   </para>
   <para>

-   <literal>eventl</literal>, <literal>malloc</literal>, 
+   <literal>eventl</literal>, <literal>malloc</literal>,

    <literal>nmem</literal>, <literal>odr</literal> are used internally for
    debugging yaz.
   </para>
   <para>
   </para>
    <literal>nmem</literal>, <literal>odr</literal> are used internally for
    debugging yaz.
   </para>
   <para>
   </para>

- </refsect1> 
+ </refsect1>

 
  <refsect1><title>LOG LEVELS FOR CLIENTS</title>
   <para>
    <literal>zoom</literal> logs the calls to the zoom API, which may be useful
    in debugging client applications.
   </para>
 
  <refsect1><title>LOG LEVELS FOR CLIENTS</title>
   <para>
    <literal>zoom</literal> logs the calls to the zoom API, which may be useful
    in debugging client applications.
   </para>

- </refsect1> 
+ </refsect1>

 
  <refsect1><title>LOG LEVELS FOR SERVERS</title>
   <para>
 
  <refsect1><title>LOG LEVELS FOR SERVERS</title>
   <para>

@@ -231,9 +231,9 @@
    14:45:41-23/11 yaz-ztest [requestdetail] Request to pack 1+1 1
    14:45:41-23/11 yaz-ztest [requestdetail] pms=1048576, mrs=1048576
    14:45:41-23/11 yaz-ztest [request] Present: [1] 1+1  OK 1 records returned
    14:45:41-23/11 yaz-ztest [requestdetail] Request to pack 1+1 1
    14:45:41-23/11 yaz-ztest [requestdetail] pms=1048576, mrs=1048576
    14:45:41-23/11 yaz-ztest [request] Present: [1] 1+1  OK 1 records returned

-   </screen> 
+   </screen>

   </para>
   </para>

- </refsect1> 
+ </refsect1>

 
  <refsect1><title>LOG FILENAME EXAMPLES</title>
   <para>
 
  <refsect1><title>LOG FILENAME EXAMPLES</title>
   <para>

@@ -243,11 +243,11 @@
    is depending on day, rotaion will occur on midnight.
   </para>
   <para>
    is depending on day, rotaion will occur on midnight.
   </para>
   <para>

-   A weekly log could be specified as 
+   A weekly log could be specified as

    <literal>-l my_%Y%U.log</literal>.
   </para>
  </refsect1>
    <literal>-l my_%Y%U.log</literal>.
   </para>
  </refsect1>

-  
+

  <refsect1><title>FILES</title>
   <para>
    <filename><replaceable>prefix</replaceable>/include/yaz/log.h</filename>
  <refsect1><title>FILES</title>
   <para>
    <filename><replaceable>prefix</replaceable>/include/yaz/log.h</filename>

diff --git a/doc/yaz-man.xml b/doc/yaz-man.xml
index 378186e..8ac4f9d 100644 (file)
--- a/doc/yaz-man.xml
+++ b/doc/yaz-man.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN" 
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN"

  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
 [
      <!ENTITY % local SYSTEM "local.ent">
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
 [
      <!ENTITY % local SYSTEM "local.ent">

@@ -14,18 +14,18 @@
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>

- 
+

  <refmeta>
   <refentrytitle>yaz</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo class="manual">Conventions and miscellaneous</refmiscinfo>
  </refmeta>
  <refmeta>
   <refentrytitle>yaz</refentrytitle>
   <manvolnum>7</manvolnum>
   <refmiscinfo class="manual">Conventions and miscellaneous</refmiscinfo>
  </refmeta>

- 
+

  <refnamediv>
   <refname>yaz</refname>
   <refpurpose>Z39.50 toolkit.</refpurpose>
  </refnamediv>
  <refnamediv>
   <refname>yaz</refname>
   <refpurpose>Z39.50 toolkit.</refpurpose>
  </refnamediv>

- 
+

  <refsect1><title>DESCRIPTION</title>
   <para>
    YAZ is a C/C++ programmer's toolkit supporting the development
  <refsect1><title>DESCRIPTION</title>
   <para>
    YAZ is a C/C++ programmer's toolkit supporting the development

@@ -44,12 +44,12 @@
   <para>
    All rights reserved.
   </para>
   <para>
    All rights reserved.
   </para>

-  
+

   <para>
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are met:
   </para>
   <para>
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are met:
   </para>

-  
+

   <itemizedlist>
    <listitem>
     <para>
   <itemizedlist>
    <listitem>
     <para>

@@ -72,7 +72,7 @@
     </para>
    </listitem>
   </itemizedlist>
     </para>
    </listitem>
   </itemizedlist>

-  
+

   <para>
    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
   <para>
    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

@@ -86,9 +86,9 @@
    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
    SUCH DAMAGE.
   </para>
    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
    SUCH DAMAGE.
   </para>

-  
+

  </refsect1>
  </refsect1>

- 
+

  <refsect1><title>SEE ALSO</title>
   <para>
     <citerefentry>
  <refsect1><title>SEE ALSO</title>
   <para>
     <citerefentry>

diff --git a/doc/yaz-marcdump-man.xml b/doc/yaz-marcdump-man.xml
index 5a66ea3..d7bfa0e 100644 (file)
--- a/doc/yaz-marcdump-man.xml
+++ b/doc/yaz-marcdump-man.xml
@@ -20,12 +20,12 @@
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>

- 
+

  <refnamediv>
   <refname>yaz-marcdump</refname>
   <refpurpose>MARC record dump utility</refpurpose>
  </refnamediv>
  <refnamediv>
   <refname>yaz-marcdump</refname>
   <refpurpose>MARC record dump utility</refpurpose>
  </refnamediv>

- 
+

  <refsynopsisdiv>
   <cmdsynopsis>
    <command>yaz-marcdump</command>
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>yaz-marcdump</command>

@@ -44,12 +44,12 @@
    <arg choice="opt" rep="repeat">file</arg>
   </cmdsynopsis>
  </refsynopsisdiv>
    <arg choice="opt" rep="repeat">file</arg>
   </cmdsynopsis>
  </refsynopsisdiv>

- 
+

  <refsect1><title>DESCRIPTION</title>
   <para>
    <command>yaz-marcdump</command> reads MARC records from one or
    more files.
  <refsect1><title>DESCRIPTION</title>
   <para>
    <command>yaz-marcdump</command> reads MARC records from one or
    more files.

-   It parses each record and supports output in line-format, 
+   It parses each record and supports output in line-format,

    ISO2709, MARCXML, MarcXchange as well as Hex output.
   </para>
   <para>
    ISO2709, MARCXML, MarcXchange as well as Hex output.
   </para>
   <para>

@@ -72,9 +72,9 @@
    character set conversion of each record.
   </para>
  </refsect1>
    character set conversion of each record.
   </para>
  </refsect1>

- 
+

  <refsect1><title>OPTIONS</title>
  <refsect1><title>OPTIONS</title>

-  
+

   <variablelist>
    <varlistentry>
     <term>-i <replaceable>format</replaceable></term>
   <variablelist>
    <varlistentry>
     <term>-i <replaceable>format</replaceable></term>

@@ -143,7 +143,7 @@
    <varlistentry>
     <term>-C <replaceable>chunksize</replaceable></term>
     <listitem><para>
    <varlistentry>
     <term>-C <replaceable>chunksize</replaceable></term>
     <listitem><para>

-      Specifies chunk size; to be used conjunction with option 
+      Specifies chunk size; to be used conjunction with option

       <literal>-s</literal>.
      </para></listitem>
    </varlistentry>
       <literal>-s</literal>.
      </para></listitem>
    </varlistentry>

@@ -170,7 +170,7 @@
       Useful if you have ill-formatted ISO2709 records as input.
      </para></listitem>
    </varlistentry>
       Useful if you have ill-formatted ISO2709 records as input.
      </para></listitem>
    </varlistentry>

-   
+

    <varlistentry>
     <term>-V</term>
     <listitem><para>
    <varlistentry>
     <term>-V</term>
     <listitem><para>

@@ -206,7 +206,7 @@
     yaz-marcdump -f MARC8 -t UTF8 -o turbomarc -i marc marc21.raw >out.xml
    </screen>
   </para>
     yaz-marcdump -f MARC8 -t UTF8 -o turbomarc -i marc marc21.raw >out.xml
    </screen>
   </para>

- </refsect1> 
+ </refsect1>

 
  <refsect1><title>FILES</title>
   <para>
 
  <refsect1><title>FILES</title>
   <para>

diff --git a/doc/yaz-url-man.xml b/doc/yaz-url-man.xml
index 8c9786c..65cd4ef 100644 (file)
--- a/doc/yaz-url-man.xml
+++ b/doc/yaz-url-man.xml
@@ -14,13 +14,13 @@
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>

- 
+

  <refmeta>
   <refentrytitle>yaz-url</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>
  <refmeta>
   <refentrytitle>yaz-url</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>

- 
+

  <refnamediv>
   <refname>yaz-url</refname>
   <refpurpose>YAZ URL fetch utility</refpurpose>
  <refnamediv>
   <refname>yaz-url</refname>
   <refpurpose>YAZ URL fetch utility</refpurpose>

@@ -38,7 +38,7 @@
    <arg rep="repeat">url</arg>
   </cmdsynopsis>
  </refsynopsisdiv>
    <arg rep="repeat">url</arg>
   </cmdsynopsis>
  </refsynopsisdiv>

- 
+

  <refsect1><title>DESCRIPTION</title>
   <para>
    <command>yaz-url</command> is utility to get web content. It is very
  <refsect1><title>DESCRIPTION</title>
   <para>
    <command>yaz-url</command> is utility to get web content. It is very

diff --git a/doc/yaz-ztest-man.xml b/doc/yaz-ztest-man.xml
index 566c938..a6002e6 100644 (file)
--- a/doc/yaz-ztest-man.xml
+++ b/doc/yaz-ztest-man.xml
@@ -17,18 +17,18 @@
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>

- 
+

  <refmeta>
   <refentrytitle>yaz-ztest</refentrytitle>
   <manvolnum>8</manvolnum>
   <refmiscinfo class="manual">System management commands</refmiscinfo>
  </refmeta>
  <refmeta>
   <refentrytitle>yaz-ztest</refentrytitle>
   <manvolnum>8</manvolnum>
   <refmiscinfo class="manual">System management commands</refmiscinfo>
  </refmeta>

- 
+

  <refnamediv>
   <refname>yaz-ztest</refname>
   <refpurpose>Z39.50/SRU Test Server</refpurpose>
  </refnamediv>
  <refnamediv>
   <refname>yaz-ztest</refname>
   <refpurpose>Z39.50/SRU Test Server</refpurpose>
  </refnamediv>

- 
+

  <refsynopsisdiv>
   &gfs-synopsis;
  </refsynopsisdiv>
  <refsynopsisdiv>
   &gfs-synopsis;
  </refsynopsisdiv>

@@ -64,10 +64,10 @@
    <title>TESTING</title>
    <para>
     <command>yaz-ztest</command> normally returns a random hit count between
    <title>TESTING</title>
    <para>
     <command>yaz-ztest</command> normally returns a random hit count between

-    0 and 24. However, if a query term includes leading digits, then the 
+    0 and 24. However, if a query term includes leading digits, then the

     integer value of that term is used as hit count. This allows testers
     to return any number of hits. <command>yaz-ztest</command> includes
     integer value of that term is used as hit count. This allows testers
     to return any number of hits. <command>yaz-ztest</command> includes

-    24 MARC records for testing. Hit counts exceeding 24 will make 
+    24 MARC records for testing. Hit counts exceeding 24 will make

     <command>yaz-ztest</command> return the same record batch over and over..
     So record at position 1, 25, 49, etc .. are equivalent.
    </para>
     <command>yaz-ztest</command> return the same record batch over and over..
     So record at position 1, 25, 49, etc .. are equivalent.
    </para>

@@ -96,7 +96,7 @@
      a random sleep between the first and second number.
    </para>
    <para>
      a random sleep between the first and second number.
    </para>
    <para>

-     The database parameter <literal>seed</literal> takes an integer 
+     The database parameter <literal>seed</literal> takes an integer

      as value. This will call <literal>srand</literal> with this integer to
      ensure that the random behavior can be re-played.
    </para>
      as value. This will call <literal>srand</literal> with this integer to
      ensure that the random behavior can be re-played.
    </para>

diff --git a/doc/yaz.xml b/doc/yaz.xml
index 7d51b20..17989c6 100644 (file)
--- a/doc/yaz.xml
+++ b/doc/yaz.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"

-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" 
+    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"

 [
      <!ENTITY % local SYSTEM "local.ent">
      %local;
 [
      <!ENTITY % local SYSTEM "local.ent">
      %local;

@@ -10,7 +10,7 @@
      %idcommon;
 ]>
 <book>
      %idcommon;
 ]>
 <book>

- &bookinfo; 
+ &bookinfo;

  &chap-introduction;
  &chap-installation;
  &chap-zoom;
  &chap-introduction;
  &chap-installation;
  &chap-zoom;

@@ -39,7 +39,7 @@
  </para>
  &std-oid-table;
  </appendix>
  </para>
  &std-oid-table;
  </appendix>

-  
+

  &app-license;
  &app-indexdata;
  &app-credits;
  &app-license;
  &app-indexdata;
  &app-credits;

diff --git a/doc/zoom.xml b/doc/zoom.xml
index 6c88750..b12e8f6 100644 (file)
--- a/doc/zoom.xml
+++ b/doc/zoom.xml
@@ -45,8 +45,8 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
     <literal>sru=get,http://sru.miketaylor.org.uk:80/sru.pl</literal>
   </para>
   <para>
     <literal>sru=get,http://sru.miketaylor.org.uk:80/sru.pl</literal>
   </para>
   <para>

-    <ulink url="&url.solr;">SOLR</ulink>  protocol support was added to YAZ in version 4.1.0, 
-    as a dialect of a SRU protocol, since both are HTTP based protocols. 
+    <ulink url="&url.solr;">SOLR</ulink>  protocol support was added to YAZ in version 4.1.0,
+    as a dialect of a SRU protocol, since both are HTTP based protocols.

   </para>
   <para>
    The lack of a simple Z39.50 client API for &yaz; has become more
   </para>
   <para>
    The lack of a simple Z39.50 client API for &yaz; has become more

@@ -62,14 +62,14 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
    <ulink url="&url.zoom;">ZOOM web-site</ulink> for
    more information.
   </para>
    <ulink url="&url.zoom;">ZOOM web-site</ulink> for
    more information.
   </para>

-  
+

   <para>
    In order to fully understand this chapter you should read and
    try the example programs <literal>zoomtst1.c</literal>,
    <literal>zoomtst2.c</literal>, .. in the <literal>zoom</literal>
    directory.
   </para>
   <para>
    In order to fully understand this chapter you should read and
    try the example programs <literal>zoomtst1.c</literal>,
    <literal>zoomtst2.c</literal>, .. in the <literal>zoom</literal>
    directory.
   </para>

-  
+

   <para>
    The C language misses features found in object oriented languages
    such as C++, Java, etc. For example, you'll have to manually,
   <para>
    The C language misses features found in object oriented languages
    such as C++, Java, etc. For example, you'll have to manually,

@@ -86,29 +86,29 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
    protocol.
   </para>
   <sect1 id="zoom-connections"><title>Connections</title>
    protocol.
   </para>
   <sect1 id="zoom-connections"><title>Connections</title>

-   
+

    <para>The Connection object is a session with a target.
    </para>
    <synopsis>
     #include &lt;yaz/zoom.h>
    <para>The Connection object is a session with a target.
    </para>
    <synopsis>
     #include &lt;yaz/zoom.h>

-    
+

     ZOOM_connection ZOOM_connection_new (const char *host, int portnum);
     ZOOM_connection ZOOM_connection_new (const char *host, int portnum);

-    
+

     ZOOM_connection ZOOM_connection_create (ZOOM_options options);
     ZOOM_connection ZOOM_connection_create (ZOOM_options options);

-    
+

     void ZOOM_connection_connect(ZOOM_connection c, const char *host,
                                  int portnum);
     void ZOOM_connection_destroy(ZOOM_connection c);
    </synopsis>
    <para>
     Connection objects are created with either function
     void ZOOM_connection_connect(ZOOM_connection c, const char *host,
                                  int portnum);
     void ZOOM_connection_destroy(ZOOM_connection c);
    </synopsis>
    <para>
     Connection objects are created with either function

-    <function>ZOOM_connection_new</function> or 
+    <function>ZOOM_connection_new</function> or

     <function>ZOOM_connection_create</function>.
     The former creates and automatically attempts to establish a network
     connection with the target. The latter doesn't establish
     a connection immediately, thus allowing you to specify options
     before establishing network connection using the function
     <function>ZOOM_connection_create</function>.
     The former creates and automatically attempts to establish a network
     connection with the target. The latter doesn't establish
     a connection immediately, thus allowing you to specify options
     before establishing network connection using the function

-    <function>ZOOM_connection_connect</function>. 
+    <function>ZOOM_connection_connect</function>.

     If the port number, <literal>portnum</literal>, is zero, the
     <literal>host</literal> is consulted for a port specification.
     If no port is given, 210 is used. A colon denotes the beginning of
     If the port number, <literal>portnum</literal>, is zero, the
     <literal>host</literal> is consulted for a port specification.
     If no port is given, 210 is used. A colon denotes the beginning of

@@ -118,8 +118,8 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
    <para>
     You can prefix the host with a scheme followed by colon. The
     default scheme is <literal>tcp</literal> (Z39.50 protocol).
    <para>
     You can prefix the host with a scheme followed by colon. The
     default scheme is <literal>tcp</literal> (Z39.50 protocol).

-    The scheme <literal>http</literal> selects SRU/get over HTTP by default, 
-    but can overridded to use SRU/post, SRW and the SOLR protocol. 
+    The scheme <literal>http</literal> selects SRU/get over HTTP by default,
+    but can overridded to use SRU/post, SRW and the SOLR protocol.

    </para>
    <para>
     You can prefix the scheme-qualified host-string with one or more
    </para>
    <para>
     You can prefix the scheme-qualified host-string with one or more

@@ -154,7 +154,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
     The functions <function>ZOOM_connection_option_set</function> and
     <function>ZOOM_connection_option_setl</function> allows you to
     set an option given by <parameter>key</parameter> to the value
     The functions <function>ZOOM_connection_option_set</function> and
     <function>ZOOM_connection_option_setl</function> allows you to
     set an option given by <parameter>key</parameter> to the value

-    <parameter>value</parameter> for the connection. 
+    <parameter>value</parameter> for the connection.

     For <function>ZOOM_connection_option_set</function>, the
     value is assumed to be a 0-terminated string. Function
     <function>ZOOM_connection_option_setl</function> specifies a
     For <function>ZOOM_connection_option_set</function>, the
     value is assumed to be a 0-terminated string. Function
     <function>ZOOM_connection_option_setl</function> specifies a

@@ -207,7 +207,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
        of a client. Is used of ZOOM is used in a gateway of some sort.
        </entry><entry>none</entry></row>
       <row><entry>
        of a client. Is used of ZOOM is used in a gateway of some sort.
        </entry><entry>none</entry></row>
       <row><entry>

-        async</entry><entry>If true (1) the connection operates in 
+        async</entry><entry>If true (1) the connection operates in

         asynchronous operation which means that all calls are non-blocking
         except
         <link linkend="zoom.events"><function>ZOOM_event</function></link>.
         asynchronous operation which means that all calls are non-blocking
         except
         <link linkend="zoom.events"><function>ZOOM_event</function></link>.

@@ -296,9 +296,9 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
         facets</entry><entry>
        A FacetList is comma-separated list of facet, which is defined
        as <literal>AttributeList</literal>  and a optional FacetTerm
         facets</entry><entry>
        A FacetList is comma-separated list of facet, which is defined
        as <literal>AttributeList</literal>  and a optional FacetTerm

-       (a Term and a frequency). On request the terms is missing. 
+       (a Term and a frequency). On request the terms is missing.

        On response the the list contains the terms that the target
        On response the the list contains the terms that the target

-       could collect. 
+       could collect.

        </entry><entry>none</entry></row>
       <row><entry>
         apdulog</entry><entry>
        </entry><entry>none</entry></row>
       <row><entry>
         apdulog</entry><entry>

@@ -311,7 +311,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
    </table>
    <para>
     If either option <literal>lang</literal> or <literal>charset</literal>
    </table>
    <para>
     If either option <literal>lang</literal> or <literal>charset</literal>

-    is set, then 
+    is set, then

     <ulink url="&url.z39.50.charneg;">
      Character Set and Language Negotiation</ulink> is in effect.
    </para>
     <ulink url="&url.z39.50.charneg;">
      Character Set and Language Negotiation</ulink> is in effect.
    </para>

@@ -415,7 +415,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
     More query types will be added in future versions of &yaz;, such as
     <link linkend="CCL">CCL</link> to RPN-mapping, native CCL query,
     etc. In addition to a search, a sort criteria may be set. Function
     More query types will be added in future versions of &yaz;, such as
     <link linkend="CCL">CCL</link> to RPN-mapping, native CCL query,
     etc. In addition to a search, a sort criteria may be set. Function

-    <function>ZOOM_query_sortby</function> specifies a 
+    <function>ZOOM_query_sortby</function> specifies a

     sort criteria using the same string notation for sort as offered by
     the <link linkend="sortspec">YAZ client</link>.
    </para>
     sort criteria using the same string notation for sort as offered by
     the <link linkend="sortspec">YAZ client</link>.
    </para>

@@ -466,7 +466,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
     The number of hits also called result-count is returned by
     function <function>ZOOM_resultset_size</function>.
    </para>
     The number of hits also called result-count is returned by
     function <function>ZOOM_resultset_size</function>.
    </para>

-   <table id="zoom.resultset.options" 
+   <table id="zoom.resultset.options"

     frame="top"><title>ZOOM Result set Options</title>
     <tgroup cols="3">
      <colspec colwidth="4*" colname="name"></colspec>
     frame="top"><title>ZOOM Result set Options</title>
     <tgroup cols="3">
      <colspec colwidth="4*" colname="name"></colspec>

@@ -481,7 +481,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
      </thead>
      <tbody>
       <row><entry>
      </thead>
      <tbody>
       <row><entry>

-        start</entry><entry>Offset of first record to be 
+        start</entry><entry>Offset of first record to be

         retrieved from target. First record has offset 0 unlike the
         protocol specifications where first record has position 1.
        This option affects ZOOM_resultset_search and
         retrieved from target. First record has offset 0 unlike the
         protocol specifications where first record has position 1.
        This option affects ZOOM_resultset_search and

@@ -491,7 +491,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
        function ZOOM_resultset_records should be used.
        </entry><entry>0</entry></row>
       <row><entry>
        function ZOOM_resultset_records should be used.
        </entry><entry>0</entry></row>
       <row><entry>

-        count</entry><entry>Number of records to be retrieved. 
+        count</entry><entry>Number of records to be retrieved.

        This option affects ZOOM_resultset_search and
        ZOOM_resultset_search_pqf and must be set before any of
        these functions are invoked.
        This option affects ZOOM_resultset_search and
        ZOOM_resultset_search_pqf and must be set before any of
        these functions are invoked.

@@ -504,7 +504,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
        option is also supported for the benefit of old applications.)
        </entry><entry>0</entry></row>
       <row><entry>
        option is also supported for the benefit of old applications.)
        </entry><entry>0</entry></row>
       <row><entry>

-        elementSetName</entry><entry>Element-Set name of records. 
+        elementSetName</entry><entry>Element-Set name of records.

         Most targets should honor element set name <literal>B</literal>
         and <literal>F</literal> for brief and full respectively.
        </entry><entry>none</entry></row>
         Most targets should honor element set name <literal>B</literal>
         and <literal>F</literal> for brief and full respectively.
        </entry><entry>none</entry></row>

@@ -539,14 +539,14 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
    </para>
    <para>
     This information is a list of of items, where each item is
    </para>
    <para>
     This information is a list of of items, where each item is

-    information about a term or subquery. All items in the list 
-    are prefixed by 
+    information about a term or subquery. All items in the list
+    are prefixed by

     <literal>SearchResult.</literal><replaceable>no</replaceable>
     <literal>SearchResult.</literal><replaceable>no</replaceable>

-    where no presents the item number (0=first, 1=second). 
+    where no presents the item number (0=first, 1=second).

     Read <literal>searchresult.size</literal> to determine the
     number of items.
    </para>
     Read <literal>searchresult.size</literal> to determine the
     number of items.
    </para>

-   <table id="zoom.search.info.report.options" 
+   <table id="zoom.search.info.report.options"

     frame="top"><title>Search Info Report Options</title>
     <tgroup cols="2">
      <colspec colwidth="4*" colname="name"></colspec>
     frame="top"><title>Search Info Report Options</title>
     <tgroup cols="2">
      <colspec colwidth="4*" colname="name"></colspec>

@@ -659,13 +659,13 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
      <literal>preferredRecordSyntax</literal> are ignored.
     </para>
     <para>
      <literal>preferredRecordSyntax</literal> are ignored.
     </para>
     <para>

-     Options <literal>start</literal> and <literal>count</literal> 
+     Options <literal>start</literal> and <literal>count</literal>

      are supported by SRU.
      The remaining options
      are supported by SRU.
      The remaining options

-     <literal>piggyback</literal>, 
-     <literal>smallSetUpperBound</literal>, 
-     <literal>largeSetLowerBound</literal>, 
-     <literal>mediumSetPresentNumber</literal>, 
+     <literal>piggyback</literal>,
+     <literal>smallSetUpperBound</literal>,
+     <literal>largeSetLowerBound</literal>,
+     <literal>mediumSetPresentNumber</literal>,

      <literal>mediumSetElementSetName</literal>,
       <literal>smallSetElementSetName</literal> are
      unsupported.
      <literal>mediumSetElementSetName</literal>,
       <literal>smallSetElementSetName</literal> are
      unsupported.

@@ -682,7 +682,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
     <para>
      Unfortunately, SRU or SOLR does not define a database setting. Hence,
      <literal>databaseName</literal> is unsupported and ignored.
     <para>
      Unfortunately, SRU or SOLR does not define a database setting. Hence,
      <literal>databaseName</literal> is unsupported and ignored.

-     However, the path part in host parameter for functions 
+     However, the path part in host parameter for functions

      <function>ZOOM_connecton_new</function> and
      <function>ZOOM_connection_connect</function> acts as a
      database (at least for the &yaz; SRU server).
      <function>ZOOM_connecton_new</function> and
      <function>ZOOM_connection_connect</function> acts as a
      database (at least for the &yaz; SRU server).

@@ -711,7 +711,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
      void ZOOM_record_destroy(ZOOM_record rec);
    </synopsis>
    <para>
      void ZOOM_record_destroy(ZOOM_record rec);
    </synopsis>
    <para>

-    References to temporary records are returned by functions 
+    References to temporary records are returned by functions

     <function>ZOOM_resultset_records</function> or
     <function>ZOOM_resultset_record</function>.
     </para>
     <function>ZOOM_resultset_records</function> or
     <function>ZOOM_resultset_record</function>.
     </para>

@@ -723,7 +723,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
    </para>
    <para>
     A single record is returned by function
    </para>
    <para>
     A single record is returned by function

-    <function>ZOOM_resultset_record</function> that takes a 
+    <function>ZOOM_resultset_record</function> that takes a

     position as argument. First record has position zero.
     If no record could be obtained <literal>NULL</literal> is returned.
    </para>
     position as argument. First record has position zero.
     If no record could be obtained <literal>NULL</literal> is returned.
    </para>

@@ -768,7 +768,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
     If <replaceable>to</replaceable> is omitted UTF-8 is assumed.
     If charset is not given, then no character set conversion takes place.
    </para>
     If <replaceable>to</replaceable> is omitted UTF-8 is assumed.
     If charset is not given, then no character set conversion takes place.
    </para>

-   
+

    <para>OPAC records may be returned in a different
      set from the bibliographic MARC record. If this is this the case,
     <replaceable>opacfrom</replaceable> should be set to the character set
    <para>OPAC records may be returned in a different
      set from the bibliographic MARC record. If this is this the case,
     <replaceable>opacfrom</replaceable> should be set to the character set

@@ -782,13 +782,13 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
    <para>
     The format argument controls whether record data should be XML
     pretty-printed (post process operation).
    <para>
     The format argument controls whether record data should be XML
     pretty-printed (post process operation).

-    It is enabled only if format value <replaceable>v</replaceable> is 
+    It is enabled only if format value <replaceable>v</replaceable> is

     <literal>1</literal> and the record content is XML well-formed.
    </para>
    <para>
     In addition, for certain types, the length
     <literal>len</literal> passed will be set to the size in bytes of
     <literal>1</literal> and the record content is XML well-formed.
    </para>
    <para>
     In addition, for certain types, the length
     <literal>len</literal> passed will be set to the size in bytes of

-    the returned information. 
+    the returned information.

     </para>
    <para>
     The following are the supported values for <replaceable>form</replaceable>.
     </para>
    <para>
     The following are the supported values for <replaceable>form</replaceable>.

@@ -796,7 +796,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
      <varlistentry><term><literal>database</literal></term>
       <listitem><para>Database of record is returned
         as a C null-terminated string. Return type
      <varlistentry><term><literal>database</literal></term>
       <listitem><para>Database of record is returned
         as a C null-terminated string. Return type

-        <literal>const char *</literal>. 
+        <literal>const char *</literal>.

        </para></listitem>
      </varlistentry>
      <varlistentry><term><literal>syntax</literal></term>
        </para></listitem>
      </varlistentry>
      <varlistentry><term><literal>syntax</literal></term>

@@ -804,13 +804,13 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
         as a C null-terminated string containing the symbolic name of
        the record syntax, e.g. <literal>Usmarc</literal>. Return type
        is
         as a C null-terminated string containing the symbolic name of
        the record syntax, e.g. <literal>Usmarc</literal>. Return type
        is

-        <literal>const char *</literal>. 
+        <literal>const char *</literal>.

        </para></listitem>
      </varlistentry>
      <varlistentry><term><literal>schema</literal></term>
       <listitem><para>The schema of the record is returned
         as a C null-terminated string. Return type is
        </para></listitem>
      </varlistentry>
      <varlistentry><term><literal>schema</literal></term>
       <listitem><para>The schema of the record is returned
         as a C null-terminated string. Return type is

-        <literal>const char *</literal>. 
+        <literal>const char *</literal>.

        </para></listitem>
      </varlistentry>
      <varlistentry><term><literal>render</literal></term>
        </para></listitem>
      </varlistentry>
      <varlistentry><term><literal>render</literal></term>

@@ -823,7 +823,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
      <varlistentry><term><literal>raw</literal></term>
       <listitem><para>The record is returned in the internal
         YAZ specific format. For GRS-1, Explain, and others, the
      <varlistentry><term><literal>raw</literal></term>
       <listitem><para>The record is returned in the internal
         YAZ specific format. For GRS-1, Explain, and others, the

-        raw data is returned as type 
+        raw data is returned as type

         <literal>Z_External *</literal> which is just the type for
         the member <literal>retrievalRecord</literal> in
         type <literal>NamePlusRecord</literal>.
         <literal>Z_External *</literal> which is just the type for
         the member <literal>retrievalRecord</literal> in
         type <literal>NamePlusRecord</literal>.

@@ -837,9 +837,9 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
        returned verbatim. MARC records are returned in
        <ulink url="&url.marcxml;">
         MARCXML
        returned verbatim. MARC records are returned in
        <ulink url="&url.marcxml;">
         MARCXML

-        </ulink> 
+        </ulink>

        (converted from ISO2709 to MARCXML by YAZ).
        (converted from ISO2709 to MARCXML by YAZ).

-       OPAC records are also converted to XML and the 
+       OPAC records are also converted to XML and the

        bibliographic record is converted to MARCXML (when possible).
        GRS-1 records are not supported for this form.
         Upon completion, the XML buffer is returned
        bibliographic record is converted to MARCXML (when possible).
        GRS-1 records are not supported for this form.
         Upon completion, the XML buffer is returned

@@ -859,7 +859,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
        returned verbatim. MARC records are returned in
        <link linkend="tools.turbomarc">
         TurboMARC
        returned verbatim. MARC records are returned in
        <link linkend="tools.turbomarc">
         TurboMARC

-       </link> 
+       </link>

        (converted from ISO2709 to TurboMARC by YAZ).
        Upon completion, the XML buffer is returned
        (type <literal>const char *</literal>) and length is stored in
        (converted from ISO2709 to TurboMARC by YAZ).
        Upon completion, the XML buffer is returned
        (type <literal>const char *</literal>) and length is stored in

@@ -871,7 +871,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
    <para>
     Most
     <ulink url="&url.marc21;">MARC21</ulink>
    <para>
     Most
     <ulink url="&url.marc21;">MARC21</ulink>

-    records uses the 
+    records uses the

     <ulink url="&url.marc8;">MARC-8</ulink>
     character set encoding.
     An application that wishes to display in Latin-1 would use
     <ulink url="&url.marc8;">MARC-8</ulink>
     character set encoding.
     An application that wishes to display in Latin-1 would use

@@ -910,10 +910,10 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
   </sect1>
   <sect1 id="zoom.facets"><title>Facets</title>
    <para>
   </sect1>
   <sect1 id="zoom.facets"><title>Facets</title>
    <para>

-    Facets operations is not part of the official ZOOM specification, but is an Index Data extension 
-    for YAZ-based Z39.50 targets or <ulink url="&url.solr;">SOLR</ulink> targets. 
-    In case the target can and is requested to return facets, using a result set the ZOOM client 
-    can request one or all facet fields. Using a facet field the client can request the term count and 
+    Facets operations is not part of the official ZOOM specification, but is an Index Data extension
+    for YAZ-based Z39.50 targets or <ulink url="&url.solr;">SOLR</ulink> targets.
+    In case the target can and is requested to return facets, using a result set the ZOOM client
+    can request one or all facet fields. Using a facet field the client can request the term count and

     then interate over the terms.
    </para>
    <synopsis>
     then interate over the terms.
    </para>
    <synopsis>

@@ -928,7 +928,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
     const char *ZOOM_facet_field_get_term(ZOOM_facet_field facet_field, size_t idx, int *freq);
    </synopsis>
    <para>
     const char *ZOOM_facet_field_get_term(ZOOM_facet_field facet_field, size_t idx, int *freq);
    </synopsis>
    <para>

-    References to temporary structures are returned by all functions. They are only valid as long the Result set is valid.  
+    References to temporary structures are returned by all functions. They are only valid as long the Result set is valid.

     <function>ZOOM_resultset_get_facet_field</function> or
     <function>ZOOM_resultset_get_facet_field_by_index</function>.
     <function>ZOOM_resultset_facets</function>.
     <function>ZOOM_resultset_get_facet_field</function> or
     <function>ZOOM_resultset_get_facet_field_by_index</function>.
     <function>ZOOM_resultset_facets</function>.

@@ -938,28 +938,28 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
     </para>
    <para id="zoom.resultset.get_facet_field">
     A single Facet field  is returned by function
     </para>
    <para id="zoom.resultset.get_facet_field">
     A single Facet field  is returned by function

-    <function>ZOOM_resultset_get_facet_field</function> or <function>ZOOM_resultset_get_facet_field_by_index</function> that takes a 
+    <function>ZOOM_resultset_get_facet_field</function> or <function>ZOOM_resultset_get_facet_field_by_index</function> that takes a

     result set and facet name or positive index respectively. First facet has position zero.
     If no facet could be obtained (invalid name or index out of bounds) <literal>NULL</literal> is returned.
    </para>
    <para id="zoom.resultset.facets">
     result set and facet name or positive index respectively. First facet has position zero.
     If no facet could be obtained (invalid name or index out of bounds) <literal>NULL</literal> is returned.
    </para>
    <para id="zoom.resultset.facets">

-    An array of facets field can be returned by <function>ZOOM_resultset_facets</function>. The length of the array is 
-    given by <function>ZOOM_resultset_facets_size</function>. The array is zero-based and last entry will be at 
-    <function>ZOOM_resultset_facets_size(result_set)</function>-1. 
+    An array of facets field can be returned by <function>ZOOM_resultset_facets</function>. The length of the array is
+    given by <function>ZOOM_resultset_facets_size</function>. The array is zero-based and last entry will be at
+    <function>ZOOM_resultset_facets_size(result_set)</function>-1.

    </para>
    <para id="zoom.resultset.facets_names">
    </para>
    <para id="zoom.resultset.facets_names">

-    It is possible to interate over facets by name, by calling <function>ZOOM_resultset_facets_names</function>. 
-    This will return an const array of char * where each string can be used as parameter for 
-    <function>ZOOM_resultset_get_facet_field</function>. 
+    It is possible to interate over facets by name, by calling <function>ZOOM_resultset_facets_names</function>.
+    This will return an const array of char * where each string can be used as parameter for
+    <function>ZOOM_resultset_get_facet_field</function>.

    </para>
    <para>
    </para>
    <para>

-   Function <function>ZOOM_facet_field_name</function> gets the request facet name from a returned facet field. 
+   Function <function>ZOOM_facet_field_name</function> gets the request facet name from a returned facet field.

    </para>
    <para>
    </para>
    <para>

-   Function <function>ZOOM_facet_field_get_term</function> returns the idx'th term and term count for a facet field. 
-   Idx must between 0 and <function>ZOOM_facet_field_term_count</function>-1, otherwise the returned reference will be 
-   <literal>NULL</literal>. On a valid idx, the value of the freq reference will be the term count. 
-   The *freq parameter must be valid pointer to integer.   
+   Function <function>ZOOM_facet_field_get_term</function> returns the idx'th term and term count for a facet field.
+   Idx must between 0 and <function>ZOOM_facet_field_term_count</function>-1, otherwise the returned reference will be
+   <literal>NULL</literal>. On a valid idx, the value of the freq reference will be the term count.
+   The *freq parameter must be valid pointer to integer.

    </para>
    </sect1>
   <sect1 id="zoom.scan"><title>Scan</title>
    </para>
    </sect1>
   <sect1 id="zoom.scan"><title>Scan</title>

@@ -1010,7 +1010,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
     a scan set offset <literal>pos</literal> and returns a pointer
     to a <emphasis>raw term</emphasis> or <literal>NULL</literal> if
     non-present.
     a scan set offset <literal>pos</literal> and returns a pointer
     to a <emphasis>raw term</emphasis> or <literal>NULL</literal> if
     non-present.

-    If present, the <literal>occ</literal> and <literal>len</literal> 
+    If present, the <literal>occ</literal> and <literal>len</literal>

     are set to the number of occurrences and the length
     of the actual term respectively.
     <function>ZOOM_scanset_display_term</function> is similar to
     are set to the number of occurrences and the length
     of the actual term respectively.
     <function>ZOOM_scanset_display_term</function> is similar to

@@ -1042,7 +1042,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
     more generic alternative to <function>ZOOM_connection_scan</function>
     which allows to use both CQL and PQF for Scan.
    </para>
     more generic alternative to <function>ZOOM_connection_scan</function>
     which allows to use both CQL and PQF for Scan.
    </para>

-   
+

    <table frame="top" id="zoom.scanset.options">
     <title>ZOOM Scan Set Options</title>
     <tgroup cols="3">
    <table frame="top" id="zoom.scanset.options">
     <title>ZOOM Scan Set Options</title>
     <tgroup cols="3">

@@ -1156,7 +1156,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
    </para>
    <para>
     <function>ZOOM_package_send</function> sends
    </para>
    <para>
     <function>ZOOM_package_send</function> sends

-    the package the via connection specified in 
+    the package the via connection specified in

     <function>ZOOM_connection_package</function>.
     The <parameter>type</parameter> specifies the actual extended service
     package type to be sent.
     <function>ZOOM_connection_package</function>.
     The <parameter>type</parameter> specifies the actual extended service
     package type to be sent.

@@ -1286,7 +1286,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
        <row>
        <entry>action</entry>
        <entry>
        <row>
        <entry>action</entry>
        <entry>

-        The update action. One of 
+        The update action. One of

         <literal>specialUpdate</literal>,
         <literal>recordInsert</literal>,
         <literal>recordReplace</literal>,
         <literal>specialUpdate</literal>,
         <literal>recordInsert</literal>,
         <literal>recordReplace</literal>,

@@ -1317,7 +1317,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
          <literal>syntax</literal> (see below).
          Option <literal>recordOpaque</literal> is an alternative
          to record - and <literal>record</literal> option (above) is
          <literal>syntax</literal> (see below).
          Option <literal>recordOpaque</literal> is an alternative
          to record - and <literal>record</literal> option (above) is

-         ignored if recordOpaque is set. This option is only available in 
+         ignored if recordOpaque is set. This option is only available in

          YAZ 3.0.35 and later and is meant to facilitate Updates with
          servers from OCLC.
        </entry>
          YAZ 3.0.35 and later and is meant to facilitate Updates with
          servers from OCLC.
        </entry>

@@ -1356,9 +1356,9 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
         1, 2 or 3. Each version has a distinct OID:
         1.2.840.10003.9.5
         (<ulink url="&url.z39.50.extupdate1;">first version</ulink>) ,
         1, 2 or 3. Each version has a distinct OID:
         1.2.840.10003.9.5
         (<ulink url="&url.z39.50.extupdate1;">first version</ulink>) ,

-        1.2.840.10003.9.5.1 
-        (second version) and 
-        1.2.840.10003.9.5.1.1 
+        1.2.840.10003.9.5.1
+        (second version) and
+        1.2.840.10003.9.5.1.1

         (<ulink url="&url.z39.50.extupdate3;">third and
          newest version</ulink>).
        </entry>
         (<ulink url="&url.z39.50.extupdate3;">third and
          newest version</ulink>).
        </entry>

@@ -1367,7 +1367,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
       </tbody>
      </tgroup>
     </table>
       </tbody>
      </tgroup>
     </table>

-    
+

    </sect2>
 
    <sect2 id="zoom.database.create"><title>Database Create</title>
    </sect2>
 
    <sect2 id="zoom.database.create"><title>Database Create</title>

@@ -1375,7 +1375,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
      For Database Create, type must be set to <literal>create</literal> in
      <function>ZOOM_package_send</function>.
     </para>
      For Database Create, type must be set to <literal>create</literal> in
      <function>ZOOM_package_send</function>.
     </para>

-    
+

     <table frame="top" id="zoom.database.create.options">
      <title>Database Create Options</title>
      <tgroup cols="3">
     <table frame="top" id="zoom.database.create.options">
      <title>Database Create Options</title>
      <tgroup cols="3">

@@ -1399,13 +1399,13 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
      </tgroup>
     </table>
    </sect2>
      </tgroup>
     </table>
    </sect2>

-   
+

    <sect2 id="zoom.database.drop"><title>Database Drop</title>
     <para>
      For Database Drop, type must be set to <literal>drop</literal> in
      <function>ZOOM_package_send</function>.
     </para>
    <sect2 id="zoom.database.drop"><title>Database Drop</title>
     <para>
      For Database Drop, type must be set to <literal>drop</literal> in
      <function>ZOOM_package_send</function>.
     </para>

-    
+

     <table frame="top" id="zoom.database.drop.options">
      <title>Database Drop Options</title>
      <tgroup cols="3">
     <table frame="top" id="zoom.database.drop.options">
      <title>Database Drop Options</title>
      <tgroup cols="3">

@@ -1429,7 +1429,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
      </tgroup>
     </table>
    </sect2>
      </tgroup>
     </table>
    </sect2>

-   
+

    <sect2 id="zoom.commit"><title>Commit Operation</title>
     <para>
      For Commit, type must be set to <literal>commit</literal> in
    <sect2 id="zoom.commit"><title>Commit Operation</title>
     <para>
      For Commit, type must be set to <literal>commit</literal> in

@@ -1484,7 +1484,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
   </sect1>
   <sect1 id="zoom.events"><title>Events</title>
    <para>
   </sect1>
   <sect1 id="zoom.events"><title>Events</title>
    <para>

-    If you're developing non-blocking applications, you have to deal 
+    If you're developing non-blocking applications, you have to deal

     with events.
    </para>
    <synopsis>
     with events.
    </para>
    <synopsis>

@@ -1574,7 +1574,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
    </table>
   </sect1>
  </chapter>
    </table>
   </sect1>
  </chapter>

- 
+

  <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml
  <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml

@@ -1589,4 +1589,4 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
  sgml-namecase-general:t
  End:
  -->
  sgml-namecase-general:t
  End:
  -->

- 
+

diff --git a/doc/zoomsh-man.xml b/doc/zoomsh-man.xml
index bf55813..aafe716 100644 (file)
--- a/doc/zoomsh-man.xml
+++ b/doc/zoomsh-man.xml
@@ -14,13 +14,13 @@
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>
   <productnumber>&version;</productnumber>
   <info><orgname>Index Data</orgname></info>
  </refentryinfo>

- 
+

  <refmeta>
   <refentrytitle>zoomsh</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>
  <refmeta>
   <refentrytitle>zoomsh</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">Commands</refmiscinfo>
  </refmeta>

- 
+

  <refnamediv>
   <refname>zoomsh</refname>
   <refpurpose>ZOOM shell</refpurpose>
  <refnamediv>
   <refname>zoomsh</refname>
   <refpurpose>ZOOM shell</refpurpose>

@@ -43,7 +43,7 @@
    </para>
    <para>
     You may pass one or more commands to <command>zoomsh</command>.
    </para>
    <para>
     You may pass one or more commands to <command>zoomsh</command>.

-    These commands are invoked first. 
+    These commands are invoked first.

    </para>
   </refsect1>
 
    </para>
   </refsect1>
 

@@ -76,11 +76,11 @@ ZOOM>search computer
 localhost:9999: 7 hits
 ZOOM>show 0 1
 1 Default USmarc
 localhost:9999: 7 hits
 ZOOM>show 0 1
 1 Default USmarc

-001    11224466 
+001    11224466

 003 DLC
 005 00000000000000.0
 003 DLC
 005 00000000000000.0

-008 910710c19910701nju           00010 eng  
-010    $a    11224466 
+008 910710c19910701nju           00010 eng
+010    $a    11224466

 040    $a DLC $c DLC
 050 00 $a 123-xyz
 100 10 $a Jack Collins
 040    $a DLC $c DLC
 050 00 $a 123-xyz
 100 10 $a Jack Collins

@@ -103,13 +103,13 @@ ZOOM>quit
   </refsect1>
   <refsect1><title>COMMANDS</title>
    <variablelist>
   </refsect1>
   <refsect1><title>COMMANDS</title>
    <variablelist>

-    
+

     <varlistentry><term><literal>connect</literal>
       <replaceable>zurl</replaceable></term>
      <listitem><para>
        Connects to the target given by <replaceable>zurl</replaceable>.
       </para></listitem></varlistentry>
     <varlistentry><term><literal>connect</literal>
       <replaceable>zurl</replaceable></term>
      <listitem><para>
        Connects to the target given by <replaceable>zurl</replaceable>.
       </para></listitem></varlistentry>

-    
+

     <varlistentry><term><literal>close</literal>
       [<replaceable>zurl</replaceable>]</term>
      <listitem><para>
     <varlistentry><term><literal>close</literal>
       [<replaceable>zurl</replaceable>]</term>
      <listitem><para>

@@ -117,7 +117,7 @@ ZOOM>quit
        <replaceable>zurl</replaceable> or all targets if
        <replaceable>zurl</replaceable> was omitted.
       </para></listitem></varlistentry>
        <replaceable>zurl</replaceable> or all targets if
        <replaceable>zurl</replaceable> was omitted.
       </para></listitem></varlistentry>

-    
+

     <varlistentry><term><literal>show</literal>
       [<replaceable>start</replaceable>
       [<replaceable>count</replaceable>]]
     <varlistentry><term><literal>show</literal>
       [<replaceable>start</replaceable>
       [<replaceable>count</replaceable>]]

@@ -127,13 +127,13 @@ ZOOM>quit
        by <replaceable>start</replaceable>. First records has offset 0
        (unlike the Z39.50 protocol).
       </para></listitem></varlistentry>
        by <replaceable>start</replaceable>. First records has offset 0
        (unlike the Z39.50 protocol).
       </para></listitem></varlistentry>

-    
+

     <varlistentry><term><literal>quit</literal>
      </term>
      <listitem><para>
        Quits <command>zoomsh</command>.
       </para></listitem></varlistentry>
     <varlistentry><term><literal>quit</literal>
      </term>
      <listitem><para>
        Quits <command>zoomsh</command>.
       </para></listitem></varlistentry>

-    
+

     <varlistentry><term><literal>set</literal>
       <replaceable>name</replaceable>
       [<replaceable>value</replaceable>]
     <varlistentry><term><literal>set</literal>
       <replaceable>name</replaceable>
       [<replaceable>value</replaceable>]

@@ -142,22 +142,22 @@ ZOOM>quit
        Sets option <replaceable>name</replaceable> to
        <replaceable>value</replaceable>.
       </para></listitem></varlistentry>
        Sets option <replaceable>name</replaceable> to
        <replaceable>value</replaceable>.
       </para></listitem></varlistentry>

-    
+

     <varlistentry><term><literal>get</literal>
       <replaceable>name</replaceable>
      </term>
      <listitem><para>
        Prints value of option <replaceable>name</replaceable>.
       </para></listitem></varlistentry>
     <varlistentry><term><literal>get</literal>
       <replaceable>name</replaceable>
      </term>
      <listitem><para>
        Prints value of option <replaceable>name</replaceable>.
       </para></listitem></varlistentry>

-    
+

     <varlistentry><term><literal>help</literal>
      </term>
      <listitem><para>
        Prints list of available commands.
       </para></listitem></varlistentry>
     <varlistentry><term><literal>help</literal>
      </term>
      <listitem><para>
        Prints list of available commands.
       </para></listitem></varlistentry>

-    
+

    </variablelist>
    </variablelist>

-   
+

   </refsect1>
   <refsect1><title>SEE ALSO</title>
    <para>
   </refsect1>
   <refsect1><title>SEE ALSO</title>
    <para>