X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2Fzoom.xml;h=9c32a1535b0b5fe09868faef554f829727884504;hb=b11da5f84991a07de9caf4ab52478e0e5a1028e0;hp=55db631cce13655c1ce348f6b22f4c60138b62cf;hpb=53f20e62abbeeef515177b06c20922f50c8eea1c;p=yaz-moved-to-github.git

diff --git a/doc/zoom.xml b/doc/zoom.xml
index 55db631..9c32a15 100644
--- a/doc/zoom.xml
+++ b/doc/zoom.xml
@@ -29,22 +29,22 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
    programming language or toolkit.
   </para>
 
-  <note>
-   <para>
-    A recent addition to &yaz; is SRU support. You can now make
-    SRU ZOOM connections by specifying scheme <literal>http://</literal>
-    for the hostname for a connection.  The dialect of SRU used is
-    specified by the value of the connection's <literal>sru</literal>
-    option, which may be SRU over HTTP GET (<literal>get</literal>),
-    SRU over HTTP POST (<literal>post</literal>) or SRW (SRU over
-    SOAP) (<literal>soap</literal>).  Using the facility for embedding
-    options in target strings, a connection can be forced to use SRU
-    rather the SRW (the default) by prefixing the target string with
-    <literal>sru=get,</literal>, like this:
+  <para>
+    From YAZ version 2.1.12, <ulink url="&url.sru;">SRU</ulink> is supported.
+    You can make SRU ZOOM connections by specifying scheme
+    <literal>http://</literal> for the hostname for a connection.
+    The dialect of SRU used is specified by the value of the
+    connection's <literal>sru</literal> option, which may be SRU over
+    HTTP GET (<literal>get</literal>),
+    SRU over HTTP POST (<literal>post</literal>), (SRU over
+    SOAP) (<literal>soap</literal>) or <literal>SOLR</literal>
+    (<ulink url="&url.solr;">SOLR</ulink> Web Service).
+    Using the facility for embedding options in target strings, a
+    connection can be forced to use SRU rather the SRW (the default) by
+    prefixing the target string with <literal>sru=get,</literal>, like this:
     <literal>sru=get,http://sru.miketaylor.org.uk:80/sru.pl</literal>
    </para>
-  </note>
-
+  
   <para>
    The lack of a simple Z39.50 client API for &yaz; has become more
    and more apparent over time. So when the first &zoom; specification
@@ -192,7 +192,15 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
         It's automatically set internally when connecting to a target.
        </entry><entry>none</entry></row>
       <row><entry>
-        proxy</entry><entry>Proxy host
+        proxy</entry><entry>Proxy host. If set, the logical host
+	is encoded in the otherInfo area of the Z39.50 Init PDU
+	with OID 1.2.840.10003.10.1000.81.1.
+       </entry><entry>none</entry></row>
+      <row><entry>
+        clientIP</entry><entry>Client IP. If set, is
+	encoded in the otherInfo area of a Z39.50 PDU with OID
+	1.2.840.10003.10.1000.81.3. Holds the original IP addreses
+	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 
@@ -269,7 +277,8 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
       <row><entry>
         sru</entry><entry>
 	SRU transport type. Must be either <literal>soap</literal>,
-	<literal>get</literal> or <literal>post</literal>.
+	<literal>get</literal>, <literal>post</literal>, or
+	<literal>solr</literal>.
        </entry><entry>soap</entry></row>
       <row><entry>
         sru_version</entry><entry>
@@ -279,6 +288,14 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
 	first operation), holds the negotiated version with the server
 	(same or lower version).
        </entry><entry>1.2</entry></row>
+      <row><entry>
+        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. 
+	On response the the list contains the terms that the target
+	could collect. 
+       </entry><entry>none</entry></row>
      </tbody>
     </tgroup>
    </table>
@@ -965,7 +982,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
       <row><entry>
         number</entry><entry>Number of Scan Terms requested in next scan.
         After scan it holds the actual number of terms returned.
-       </entry><entry>10</entry></row>
+       </entry><entry>20</entry></row>
       <row><entry>
         position</entry><entry>Preferred Position of term in response
         in next scan; actual position after completion of scan.