X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2Ftools.xml;h=491d6dc1d7a8d9c1f8e9a0f796aa1ce407b64433;hb=6ab7468ae9a46a330eddc1faa88f1d4e4fff1da9;hp=b487442a4ff6e62f5ebd327e9f051191b1143c26;hpb=fb276eb339f39e6233de8e7540c4408089e8d3b3;p=yaz-moved-to-github.git

diff --git a/doc/tools.xml b/doc/tools.xml
index b487442..491d6dc 100644
--- a/doc/tools.xml
+++ b/doc/tools.xml
@@ -679,6 +679,17 @@
 	   </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
+	    gets structure phrase attached. 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
+	    in YAZ 4.2.38.
+	   </entry>
+	  </row>
+
 	  <row><entry><literal>r=o</literal></entry><entry>
 	    Allows ranges and the operators greather-than, less-than, ...
 	    equals.
@@ -731,6 +742,24 @@
 	    set to both left&amp;right.
 	   </entry>
 	  </row>
+
+	  <row><entry><literal>t=x</literal></entry><entry>
+	    Allows masking anywhere in a term, thus fully supporting
+	    # (mask one character) and ? (zero or more of any).
+	    If masking is used, trunction is set to 102 (regexp-1 in term)
+	    and the term is converted accordingly to a regular expression.
+	   </entry>
+	  </row>
+
+	  <row><entry><literal>t=z</literal></entry><entry>
+	    Allows masking anywhere in a term, thus fully supporting
+	    # (mask one character) and ? (zero or more of any).
+	    If masking is used, trunction is set to 104 (Z39.58 in term)
+	    and the term is converted accordingly to Z39.58 masking term -
+	    actually the same truncation as CCL itself.
+	   </entry>
+	  </row>
+
 	 </tbody>
 	</tgroup>
        </table>
@@ -2066,7 +2095,7 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
     </para>
     <para>
      Applications like
-     Pazpar2 uses XSLT to convert an XML encode MARC record to an internal
+     Pazpar2 uses XSLT to convert an XML encoded MARC record to an internal
      representation. This conversion mostly check the tag of a MARC field
      to determine the basic rules in the conversion. This check is
      costly when that is tag is encoded as an attribute in MARCXML.
@@ -2078,7 +2107,7 @@ void cql_to_xml_stdio(struct cql_node *cn, FILE *f);
      <itemizedlist>
       <listitem><para>
 	Record elements is part of namespace
-	"<literal>http://www.indexdata.com/MARC21/turboxml</literal>".
+	"<literal>http://www.indexdata.com/turbomarc</literal>".
        </para></listitem>
       <listitem><para>
 	A record is enclosed in element <literal>r</literal>.