Pull up Koji's changes to the SOLR-1895 ticket for sharding, and also convert some missed wildcard queries.
git-svn-id: https://svn.apache.org/repos/asf/incubator/lcf/integration/solr-4.x/trunk@1177215 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/solr/contrib/mcf/CHANGES.txt b/solr/contrib/mcf/CHANGES.txt
index 01de028..d573d17 100644
--- a/solr/contrib/mcf/CHANGES.txt
+++ b/solr/contrib/mcf/CHANGES.txt
@@ -1,7 +1,7 @@
Apache Solr ManifoldCF security Library
Release Notes
-This file describes changes to the Solr ManifoldCF security package (contrib/auth) module. See SOLR-1895 for details.
+This file describes changes to the Solr ManifoldCF security package (contrib/mcf) module.
Introduction
------------
diff --git a/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java b/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
index 0283837..fa5c9e5 100644
--- a/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
+++ b/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
@@ -171,9 +171,9 @@
//bf.setMaxClauseCount(100000);
Query allowShareOpen = new TermQuery(new Term(fieldAllowShare,NOSECURITY_TOKEN));
- Query denyShareOpen = new WildcardQuery(new Term(fieldDenyShare,NOSECURITY_TOKEN));
- Query allowDocumentOpen = new WildcardQuery(new Term(fieldAllowDocument,NOSECURITY_TOKEN));
- Query denyDocumentOpen = new WildcardQuery(new Term(fieldDenyDocument,NOSECURITY_TOKEN));
+ Query denyShareOpen = new TermQuery(new Term(fieldDenyShare,NOSECURITY_TOKEN));
+ Query allowDocumentOpen = new TermQuery(new Term(fieldAllowDocument,NOSECURITY_TOKEN));
+ Query denyDocumentOpen = new TermQuery(new Term(fieldDenyDocument,NOSECURITY_TOKEN));
if (userAccessTokens.size() == 0)
{
diff --git a/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java b/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
index 6b09950..9e3d83a 100644
--- a/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
+++ b/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
@@ -96,9 +96,9 @@
public void prepare(ResponseBuilder rb) throws IOException
{
SolrParams params = rb.req.getParams();
- if (!params.getBool(COMPONENT_NAME, true) || params.getBool(ShardParams.IS_SHARD, false))
+ if (!params.getBool(COMPONENT_NAME, true) || params.get(ShardParams.SHARDS) != null)
return;
-
+
// Log that we got here
//LOG.info("prepare() entry params:\n" + params + "\ncontext: " + rb.req.getContext());
@@ -157,9 +157,9 @@
//bf.setMaxClauseCount(100000);
Query allowShareOpen = new TermQuery(new Term(fieldAllowShare,NOSECURITY_TOKEN));
- Query denyShareOpen = new WildcardQuery(new Term(fieldDenyShare,NOSECURITY_TOKEN));
- Query allowDocumentOpen = new WildcardQuery(new Term(fieldAllowDocument,NOSECURITY_TOKEN));
- Query denyDocumentOpen = new WildcardQuery(new Term(fieldDenyDocument,NOSECURITY_TOKEN));
+ Query denyShareOpen = new TermQuery(new Term(fieldDenyShare,NOSECURITY_TOKEN));
+ Query allowDocumentOpen = new TermQuery(new Term(fieldAllowDocument,NOSECURITY_TOKEN));
+ Query denyDocumentOpen = new TermQuery(new Term(fieldDenyDocument,NOSECURITY_TOKEN));
if (userAccessTokens.size() == 0)
{
