Return-Path: X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9367110684 for ; Wed, 25 Jun 2014 15:18:14 +0000 (UTC) Received: (qmail 21814 invoked by uid 500); 25 Jun 2014 15:18:14 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 21766 invoked by uid 500); 25 Jun 2014 15:18:14 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 21756 invoked by uid 99); 25 Jun 2014 15:18:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jun 2014 15:18:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jun 2014 15:18:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DA4E8238889B; Wed, 25 Jun 2014 15:17:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1605445 - in /manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main: java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties Date: Wed, 25 Jun 2014 15:17:49 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140625151749.DA4E8238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kwright Date: Wed Jun 25 15:17:49 2014 New Revision: 1605445 URL: http://svn.apache.org/r1605445 Log: Add UI part, except for Javascript checking Modified: manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties Modified: manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java?rev=1605445&r1=1605444&r2=1605445&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java (original) +++ manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java Wed Jun 25 15:17:49 2014 @@ -1005,7 +1005,15 @@ public class SolrConnector extends org.a String mimeTypeField = parameters.getParameter(SolrConfig.PARAM_MIMETYPEFIELD); if (mimeTypeField == null) mimeTypeField = ""; - + + String contentField = parameters.getParameter(SolrConfig.PARAM_CONTENTFIELD); + if (contentField == null) + contentField = ""; + + String useExtractUpdate = parameters.getParameter(SolrConfig.PARAM_EXTRACTUPDATE); + if (useExtractUpdate == null || useExtractUpdate.length() == 0) + useExtractUpdate = "true"; + String realm = parameters.getParameter(SolrConfig.PARAM_REALM); if (realm == null) realm = ""; @@ -1460,6 +1468,31 @@ public class SolrConnector extends org.a " \n"+ " \n"+ " \n"+ +" \n"+ +" " + Messages.getBodyString(locale,"SolrConnector.UseExtractUpdateHandler") + "\n"+ +" \n" + ); + if (!useExtractUpdate.equals("false")) + { + out.print( +" \n" + ); + } + else + { + out.print( +" \n" + ); + } + out.print( +" \n"+ +" \n"+ +" \n"+ +" " + Messages.getBodyString(locale,"SolrConnector.ContentFieldName") + "\n"+ +" \n"+ +" \n"+ +" \n"+ +" \n"+ "\n" ); } @@ -1471,7 +1504,9 @@ public class SolrConnector extends org.a "\n"+ "\n"+ "\n"+ -"\n" +"\n"+ +"\n"+ +"\n" ); } @@ -1771,6 +1806,14 @@ public class SolrConnector extends org.a if (mimeTypeField != null) parameters.setParameter(SolrConfig.PARAM_MIMETYPEFIELD,mimeTypeField); + String contentField = variableContext.getParameter("contentfield"); + if (contentField != null) + parameters.setParameter(SolrConfig.PARAM_CONTENTFIELD,contentField); + + String extractUpdate = variableContext.getParameter("extractupdate"); + if (extractUpdate != null) + parameters.setParameter(SolrConfig.PARAM_EXTRACTUPDATE,extractUpdate); + String realm = variableContext.getParameter("realm"); if (realm != null) parameters.setParameter(SolrConfig.PARAM_REALM,realm); Modified: manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties?rev=1605445&r1=1605444&r2=1605445&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties (original) +++ manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties Wed Jun 25 15:17:49 2014 @@ -58,6 +58,7 @@ SolrConnector.CreatedDateFieldName=Creat SolrConnector.IndexedDateFieldName=Indexed date field name: SolrConnector.FileNameFieldName=File name field name: SolrConnector.MimeTypeFieldName=Mime type field name: +SolrConnector.ContentFieldName=Content field name: SolrConnector.MaximumDocumentLength=Maximum document length: SolrConnector.IncludedMimeTypes=Included mime types: SolrConnector.ExcludedMimeTypes=Excluded mime types: