Return-Path: X-Original-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8F28490AA for ; Mon, 27 Feb 2012 23:14:13 +0000 (UTC) Received: (qmail 14753 invoked by uid 500); 27 Feb 2012 23:14:13 -0000 Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org Received: (qmail 14714 invoked by uid 500); 27 Feb 2012 23:14:13 -0000 Mailing-List: contact connectors-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: connectors-dev@incubator.apache.org Delivered-To: mailing list connectors-commits@incubator.apache.org Received: (qmail 14707 invoked by uid 99); 27 Feb 2012 23:14:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Feb 2012 23:14:13 +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; Mon, 27 Feb 2012 23:14:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D358523889E2; Mon, 27 Feb 2012 23:13:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1294388 - in /incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch: ElasticSearchDelete.java ElasticSearchIndex.java Date: Mon, 27 Feb 2012 23:13:49 -0000 To: connectors-commits@incubator.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120227231349.D358523889E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kwright Date: Mon Feb 27 23:13:49 2012 New Revision: 1294388 URL: http://svn.apache.org/viewvc?rev=1294388&view=rev Log: Attempt to use url-encoding to make a url palatable for elastic search filename. Doesn't work though. Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java?rev=1294388&r1=1294387&r2=1294388&view=diff ============================================================================== --- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java (original) +++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java Mon Feb 27 23:13:49 2012 @@ -29,16 +29,23 @@ public class ElasticSearchDelete extends throws ManifoldCFException { super(config, client); - String fileName = FilenameUtils.getName(documentURI); - DeleteMethod method = new DeleteMethod(config.getServerLocation()); - method.setPath("/" + config.getIndexName() + "/" + config.getIndexType() - + "/" + fileName); - System.out.println("Deleting '"+documentURI+"'..."); - call(method); - System.out.println("... completed"); - System.out.println(jsonStatus); - if ("ok".equals(jsonStatus)) - return; - setResult(Result.ERROR, checkJson(jsonException)); + try + { + String fileName = java.net.URLEncoder.encode(documentURI,"utf-8"); + DeleteMethod method = new DeleteMethod(config.getServerLocation()); + method.setPath("/" + config.getIndexName() + "/" + config.getIndexType() + + "/" + fileName); + System.out.println("Deleting '"+fileName+"'..."); + call(method); + System.out.println("... completed"); + System.out.println(jsonStatus); + if ("ok".equals(jsonStatus)) + return; + setResult(Result.ERROR, checkJson(jsonException)); + } + catch (java.io.UnsupportedEncodingException e) + { + throw new ManifoldCFException(e.getMessage(),e); + } } } Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java?rev=1294388&r1=1294387&r2=1294388&view=diff ============================================================================== --- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java (original) +++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java Mon Feb 27 23:13:49 2012 @@ -43,10 +43,18 @@ public class ElasticSearchIndex extends private String fileName; public IndexRequestEntity(String documentURI, InputStream inputStream) + throws ManifoldCFException { this.documentURI = documentURI; this.inputStream = inputStream; - this.fileName = FilenameUtils.getName(documentURI); + try + { + this.fileName = java.net.URLEncoder.encode(documentURI,"utf-8"); + } + catch (java.io.UnsupportedEncodingException e) + { + throw new ManifoldCFException(e.getMessage(),e); + } } public long getContentLength()