From: Dennis Schafroth Date: Mon, 16 Aug 2010 09:01:09 +0000 (+0200) Subject: Merge branch 'solr_client' of ssh://git.indexdata.com/home/git/pub/yaz into solr_client X-Git-Tag: v4.1.0~40^2~1^2 X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=8c7858ee7a1266db5ac2e18393ef331cadb687b0;hp=45beb75c13c772c5dc305cb443208862f33061c7 Merge branch 'solr_client' of ssh://git.indexdata.com/home/git/pub/yaz into solr_client Conflicts: test/Makefile.am --- diff --git a/.cproject b/.cproject index 554acfa..766f365 100644 --- a/.cproject +++ b/.cproject @@ -40,6 +40,7 @@ @@ -105,15 +107,10 @@ - - - - - @@ -306,6 +303,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -389,6 +469,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -472,7 +635,7 @@ - + diff --git a/test/test_rpn2solr.c b/test/test_rpn2solr.c index c7aa1e9..029552c 100644 --- a/test/test_rpn2solr.c +++ b/test/test_rpn2solr.c @@ -59,6 +59,7 @@ static void tst1(void) YAZ_CHECK(compare(ct, "@and a b", "a AND b")); YAZ_CHECK(compare(ct, "@or a b", "a OR b")); YAZ_CHECK(compare(ct, "@attr 1=field abc", "field:abc")); + YAZ_CHECK(compare(ct, "@attr 1=field \"a b c\"", "field:\"a b c\"")); YAZ_CHECK(compare(ct, "@attr 1=4 abc", 0)); /* should fail */ solr_transform_define_pattern(ct, "index.title", "1=4"); @@ -66,6 +67,9 @@ static void tst1(void) solr_transform_define_pattern(ct, "index.foo", "1=bar"); YAZ_CHECK(compare(ct, "@attr 1=bar abc", "foo:abc")); + /* + YAZ_CHECK(compare(ct, "@or @attr 1=1016 water @attr 7=1 @attr 1=4 0", "any:water rank:??"); + */ solr_transform_close(ct); }