From 191c5db0e914f9774413da50bb1963ecf22b2f5c Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 13 Feb 2013 13:14:08 +0100 Subject: [PATCH] Trying to use Solr name consistently --- NEWS | 8 ++++---- client/client.c | 2 +- doc/introduction.xml | 6 +++--- doc/yaz-client-man.xml | 10 +++++----- doc/yaz-man.xml | 2 +- doc/zoom.xml | 30 +++++++++++++++--------------- include/yaz/solr.h | 2 +- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NEWS b/NEWS index f9ef2ff..70f5479 100644 --- a/NEWS +++ b/NEWS @@ -408,7 +408,7 @@ yaz_sort_spec_to_srw_sortkeys, yaz_sort_spec_to_type and 7yaz_sort_spec_to_cql. rpn2solr supports Z39.58 truncation (104). Thus, CCL truncation mode t=z will make it possible to use both single-character mask (#) and wildcard (?) in CCL . Throw diagnostic for left truncation because that is not supported -by SOLR. +by Solr. --- 4.2.13 2011/09/01 @@ -504,7 +504,7 @@ modified with a new root element if the recordData contains multiple children elements. This is to make the record XML parseable afterwards. -RPN to SOLR conversion: encode special characters. +RPN to Solr conversion: encode special characters. Generic Frontend Server: fix uinitialized member, stepSize. @@ -606,7 +606,7 @@ so it is appropriate to set Present Status to partial-4. Move yaz-config man pages to section 1. -More documentation about SOLR. +More documentation about Solr. tcp comstack: change behavior for @-specs (anyaddr). @ listens on AF_INET (IPV4) peers, and @6 listens to AF_INET6 (ipv6) peers. @@ -625,7 +625,7 @@ Fix yaz-config output: echo_source not set correctly by configure. --- 4.1.0 2010/10/05 -SOLR WebService support for yaz-client and ZOOM. +Solr Web Service support for yaz-client and ZOOM. Define record syntax JSON. OID: 1.2.840.10003.5.1000.81.3 . diff --git a/client/client.c b/client/client.c index da0fd36..a55f095 100644 --- a/client/client.c +++ b/client/client.c @@ -4448,7 +4448,7 @@ static void http_response(Z_HTTP_Response *hres) handle_srw_scan_response(sr->u.scan_response); else { - printf("Decoding of SOLR package failed\n"); + printf("Decoding of Solr package failed\n"); ret = -1; } odr_destroy(o); diff --git a/doc/introduction.xml b/doc/introduction.xml index 7b2baae..bd327b5 100644 --- a/doc/introduction.xml +++ b/doc/introduction.xml @@ -2,7 +2,7 @@ &yaz; is a C/C++ library for information retrieval applications - using the Z39.50/SRU/SOLR protocols for information retrieval. + using the Z39.50/SRU/Solr protocols for information retrieval. @@ -25,7 +25,7 @@ Supports - SOLR Web Service version 1.4.x (client side only) + Solr Web Service version 1.4.x (client side only) Supports the following transports: BER over TCP/IP @@ -43,7 +43,7 @@ Offers ZOOM C API implementing - Z39.50, SRU and SOLR Web Service. + Z39.50, SRU and Solr Web Service. The &yaz; library offers a set of useful utilities diff --git a/doc/yaz-client-man.xml b/doc/yaz-client-man.xml index 4897d76..4916c61 100644 --- a/doc/yaz-client-man.xml +++ b/doc/yaz-client-man.xml @@ -57,7 +57,7 @@ From YAZ version 4.1.0 yaz-client may also operate as a - SOLR Web Service + Solr Web Service client. @@ -394,12 +394,12 @@ Selects Web Service method and version. - Must be one of POST, - GET, SOAP (default) - or SOLR. Version + Must be one of post, + get, soap (default) + or solr. Version should be either 1.1 or 1.2 for SRU. Other versions are allowed - for testing purposes (version negotiation with SRU server). - The version is currently not used for SOLR Web Services + The version is currently not used for Solr Web Services diff --git a/doc/yaz-man.xml b/doc/yaz-man.xml index 8ac4f9d..b706541 100644 --- a/doc/yaz-man.xml +++ b/doc/yaz-man.xml @@ -31,7 +31,7 @@ YAZ is a C/C++ programmer's toolkit supporting the development of Z39.50v3 clients and servers. The YAZ toolkit offers several different levels of access to the ISO23950/Z39.50, SRU - SOLR (client only) and ILL protocols. The level that you need to use depends + Solr (client only) and ILL protocols. The level that you need to use depends on your requirements, and the role (server or client) that you want to implement. diff --git a/doc/zoom.xml b/doc/zoom.xml index c371520..78b5d72 100644 --- a/doc/zoom.xml +++ b/doc/zoom.xml @@ -35,15 +35,15 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn) connection's sru option, which may be SRU over HTTP GET (get), SRU over HTTP POST (post), (SRU over - SOAP) (soap) or SOLR - (SOLR Web Service). + SOAP) (soap) or solr + (Solr 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 sru=get,, like this: sru=get,http://sru.miketaylor.org.uk:80/sru.pl - SOLR protocol support was added to + Solr protocol support was added to YAZ in version 4.1.0, as a dialect of a SRU protocol, since both are HTTP based protocols. @@ -118,7 +118,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn) You can prefix the host with a scheme followed by colon. The default scheme is tcp (Z39.50 protocol). The scheme http selects SRU/get over HTTP by default, - but can overridded to use SRU/post, SRW and the SOLR protocol. + but can overridded to use SRU/post, SRW and the Solr protocol. You can prefix the scheme-qualified host-string with one or more @@ -279,7 +279,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn) none sru - SRU/SOLR transport type. Must be either soap, + SRU/Solr transport type. Must be either soap, get, post, or solr. soap @@ -389,14 +389,14 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn) - SRU/SOLR Protocol behavior + SRU/Solr Protocol behavior - The HTTP based protocols (SRU, SRW, SOLR) doesn't feature an Inititialize Request, so + The HTTP based protocols (SRU, SRW, Solr) doesn't feature an Inititialize Request, so the connection phase merely establishes a TCP/IP connection with the SOAP service. Most of the ZOOM connection options do not - affect SRU/SOLR and they are ignored. However, future versions + affect SRU/Solr and they are ignored. However, future versions of &yaz; might honor implementationName and put that as part of User-Agent header for HTTP requests. @@ -760,10 +760,10 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn) SRU SearchRetrieveRequest. - SOLR queries has to be done in SOLR query format. + Solr queries has to be done in Solr query format. - Unfortunately, SRU or SOLR does not define a database setting. Hence, + Unfortunately, SRU or Solr does not define a database setting. Hence, databaseName is unsupported and ignored. However, the path part in host parameter for functions ZOOM_connecton_new and @@ -916,7 +916,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn) xml The record is returned in XML if possible. - SRU, SOLR and Z39.50 records with transfer syntax XML are + SRU, Solr and Z39.50 records with transfer syntax XML are returned verbatim. MARC records are returned in MARCXML @@ -983,9 +983,9 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn) - SRU/SOLR Protocol behavior + SRU/Solr Protocol behavior - The ZOOM driver for SRU/SOLR treats records returned by a SRU/SOLR server + The ZOOM driver for SRU/Solr treats records returned by a SRU/Solr server as if they where Z39.50 records with transfer syntax XML and no element set name or database name. @@ -995,7 +995,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn) Facets operations is not part of the official ZOOM specification, but is an Index Data extension for YAZ-based Z39.50 targets or - SOLR targets. + Solr 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 @@ -1075,7 +1075,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn) - The Scan interface is supported for both Z39.50, SRU (and SOLR?). + The Scan interface is supported for both Z39.50, SRU and Solr. diff --git a/include/yaz/solr.h b/include/yaz/solr.h index a901966..8d9a65d 100644 --- a/include/yaz/solr.h +++ b/include/yaz/solr.h @@ -26,7 +26,7 @@ */ /** \file solr.h - \brief Header with public definitions about SOLR. + \brief Header with public definitions about Solr. */ #ifndef SOLR_H_INCLUDED -- 1.7.10.4