X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=doc%2Ftools.xml;h=d19faf90ff430bd3172a4281357f9dac4ff62156;hp=25443163387e6530d0e98596f730d7f5b17896b3;hb=0cd4a65083c86690792faa7bb14de67a30bcfc20;hpb=9fc96078f8d79ad107515c3e450900cce1bf8605

diff --git a/doc/tools.xml b/doc/tools.xml
index 2544316..d19faf9 100644
--- a/doc/tools.xml
+++ b/doc/tools.xml
@@ -686,8 +686,8 @@
 
 	  <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
-	    gets structure phrase attached. Phrases and words are
+	    structure phrase attached (4=1). Tokens that appear to be words
+	    gets structure word attached (4=2). Phrases and words are
 	    ANDed. This is a variant of s=al and s=pw, with the main
 	    difference that words are not split (with operator AND)
 	    but instead kept in one RPN token. This facility appeared
@@ -867,6 +867,11 @@
 	  <entry><literal>?</literal></entry>
 	 </row>
 	 <row>
+	  <entry>mask</entry>
+	  <entry>Masking character. Requires YAZ 4.2.58 or later</entry>
+	  <entry><literal>#</literal></entry>
+	 </row>
+	 <row>
 	  <entry>field</entry>
 	  <entry>Specifies how multiple fields are to be
 	   combined. There are two modes: <literal>or</literal>:
@@ -2445,6 +2450,56 @@ int cql_transform_rpn2cql_wrbuf(cql_transform_t ct,
       </itemizedlist>
      </para>
     </example>
+
+    <example id="tools.retrieval.marcxml">
+     <title>MARCXML backend</title>
+     <para>
+      SRW/SRU and Solr backends returns records in XML.
+      If they return MARCXML or MarcXchange, the retrieval module
+      can convert those into ISO2709 formats, most commonly USMARC
+      (AKA MARC21).
+      In this example, the backend returns MARCXML for schema="marcxml".
+     </para>
+     <programlisting><![CDATA[
+     <retrievalinfo>
+       <retrieval syntax="usmarc">
+         <backend syntax="xml" name="marcxml">
+	   <marc inputformat="xml" outputformat="marc"
+		 outputcharset="marc-8"/>
+	 </backend>
+       </retrieval>
+       <retrieval syntax="xml" name="marcxml"
+		  identifier="info:srw/schema/1/marcxml-v1.1"/>
+       <retrieval syntax="xml" name="dc">
+         <backend syntax="xml" name="marcxml">
+           <xslt stylesheet="MARC21slim2DC.xsl"/>
+	 </backend>
+       </retrieval>
+     </retrievalinfo>
+]]>
+     </programlisting>
+     <para>
+      This means that our frontend supports:
+      <itemizedlist>
+       <listitem>
+        <para>
+         MARC21 records (any element set name) in MARC-8 encoding.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         MARCXML records for element-set=marcxml
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         Dublin core records for element-set=dc.
+        </para>
+       </listitem>
+      </itemizedlist>
+     </para>
+    </example>
+
    </sect2>
    <sect2 id="tools.retrieval.api">
     <title>API</title>