Mailing-List: contact connectors-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
Reply-To: connectors-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1177218 - in
 /incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf: CHANGES.txt
 src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
 src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
Date: Thu, 29 Sep 2011 08:38:10 -0000
To: connectors-commits@incubator.apache.org
From: kwright@apache.org
Message-Id: <20110929083810.75734238889B@eris.apache.org>

Author: kwright
Date: Thu Sep 29 08:38:09 2011
New Revision: 1177218

URL: http://svn.apache.org/viewvc?rev=1177218&view=rev
Log:
Pull up Koji's changes from 4.x artifact

Modified:
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/CHANGES.txt
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java

Modified: incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/CHANGES.txt?rev=1177218&r1=1177217&r2=1177218&view=diff
==============================================================================
--- incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/CHANGES.txt (original)
+++ incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/CHANGES.txt Thu Sep 29 08:38:09 2011
@@ -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
 ------------

Modified: incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
URL: http://svn.apache.org/viewvc/incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java?rev=1177218&r1=1177217&r2=1177218&view=diff
==============================================================================
--- incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java (original)
+++ incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java Thu Sep 29 08:38:09 2011
@@ -170,9 +170,9 @@ public class ManifoldCFQParserPlugin ext
       //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)
       {

Modified: incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
URL: http://svn.apache.org/viewvc/incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java?rev=1177218&r1=1177217&r2=1177218&view=diff
==============================================================================
--- incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java (original)
+++ incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java Thu Sep 29 08:38:09 2011
@@ -95,9 +95,9 @@ public class ManifoldCFSearchComponent e
   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());
 		
@@ -156,9 +156,9 @@ public class ManifoldCFSearchComponent e
     //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)
     {