Return-Path: Delivered-To: apmail-lucene-solr-commits-archive@minotaur.apache.org Received: (qmail 5483 invoked from network); 3 Dec 2009 09:49:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Dec 2009 09:49:59 -0000 Received: (qmail 65392 invoked by uid 500); 3 Dec 2009 09:49:59 -0000 Delivered-To: apmail-lucene-solr-commits-archive@lucene.apache.org Received: (qmail 65326 invoked by uid 500); 3 Dec 2009 09:49:58 -0000 Mailing-List: contact solr-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: solr-dev@lucene.apache.org Delivered-To: mailing list solr-commits@lucene.apache.org Received: (qmail 65317 invoked by uid 99); 3 Dec 2009 09:49:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Dec 2009 09:49:58 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 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; Thu, 03 Dec 2009 09:49:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EE4B723888C5; Thu, 3 Dec 2009 09:49:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r886724 - in /lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport: AbstractDataImportHandlerTest.java Context.java ContextImpl.java Date: Thu, 03 Dec 2009 09:49:31 -0000 To: solr-commits@lucene.apache.org From: noble@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091203094935.EE4B723888C5@eris.apache.org> Author: noble Date: Thu Dec 3 09:49:25 2009 New Revision: 886724 URL: http://svn.apache.org/viewvc?rev=886724&view=rev Log: added resolve()/replcaeTokens to Context directly Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTest.java lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/Context.java lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ContextImpl.java Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTest.java URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTest.java?rev=886724&r1=886723&r2=886724&view=diff ============================================================================== --- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTest.java (original) +++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTest.java Thu Dec 3 09:49:25 2009 @@ -233,5 +233,13 @@ public void deleteDocByQuery(String query) { } + + public Object resolve(String var) { + return delegate.resolve(var); + } + + public String replaceTokens(String template) { + return delegate.replaceTokens(template); + } } } Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/Context.java URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/Context.java?rev=886724&r1=886723&r2=886724&view=diff ============================================================================== --- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/Context.java (original) +++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/Context.java Thu Dec 3 09:49:25 2009 @@ -208,5 +208,17 @@ */ public abstract void deleteDocByQuery(String query); + /**Use this directly to resolve variable + * @param var the variable neme + * @return the resolved value + */ + public abstract Object resolve(String var); + + /** Resolve variables in a template + * @param template + * @return The string w/ variables resolved + */ + public abstract String replaceTokens(String template); + } Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ContextImpl.java URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ContextImpl.java?rev=886724&r1=886723&r2=886724&view=diff ============================================================================== --- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ContextImpl.java (original) +++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ContextImpl.java Thu Dec 3 09:49:25 2009 @@ -214,4 +214,12 @@ docBuilder.writer.deleteByQuery(query); } } + + public Object resolve(String var) { + return resolver.resolve(var); + } + + public String replaceTokens(String template) { + return resolver.replaceTokens(template); + } }