Merge branch 'solr_client' of ssh://git.indexdata.com/home/git/pub/yaz into solr_client

diff --git a/NEWS b/NEWS
index 7f50c11..7ccecd7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+--- 4.0.12 2010/08/17
+
+Z39.50 facet support. Facet specifications are passed for search in
+other-information with ASN.1 as defined in facet.asn and OID
+.10.1000.81.5 . Facets are expressed as an Attribute list as known
+from Type-1/RPN queries.  Type 1 is field. Type 2 is sort order. Type
+3 is limit (number of entries to get in response). yaz-ztest returns
+dummy facets if a client asks for them.
+
 --- 4.0.11 2010/07/09
 
 CCL fixes: bug 2895 and bug 3539.

diff --git a/configure.ac b/configure.ac
index c31a5e9..cf93783 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl This file is part of the YAZ toolkit.
 dnl Copyright (C) 1995-2010 Index Data
 AC_PREREQ([2.60])
-AC_INIT([yaz],[4.0.11],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[4.0.12],[yaz-help@indexdata.dk])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.9])

diff --git a/debian/changelog b/debian/changelog
index 27b4bf2..692161d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yaz (4.0.12-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 17 Aug 2010 12:33:25 +0200
+
 yaz (4.0.11-1indexdata) unstable; urgency=low
 
   * Upstream.

diff --git a/debian/rules b/debian/rules
index 2b011be..a6854cf 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -98,7 +98,7 @@ binary-arch: build install
        dh_fixperms
 #      dh_perl
 #      dh_python
-       dh_makeshlibs -V 'libyaz4 (>= 4.0.10)'
+       dh_makeshlibs -V 'libyaz4 (>= 4.0.12)'
        dh_installdeb
        dh_shlibdeps  -l debian/libyaz4/usr/lib
        dh_gencontrol

diff --git a/src/solr.c b/src/solr.c
index c602d2e..eaf822c 100644 (file)
--- a/src/solr.c
+++ b/src/solr.c
@@ -170,6 +170,8 @@ int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
         }
         yaz_add_name_value_int(encode, name, value, &i,
                                "rows", srw_pdu->u.request->maximumRecords);
+        yaz_add_name_value_str(encode, name, value, &i,
+                               "fl", srw_pdu->u.request->recordSchema);
         break;
     default:
         return -1;