You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by th...@apache.org on 2014/07/16 03:17:23 UTC

svn commit: r1610893 - in /lucene/dev/trunk/solr: contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java example/example-DIH/solr/mail/conf/mail-data-config.xml

Author: thelabdude
Date: Wed Jul 16 01:17:23 2014
New Revision: 1610893

URL: http://svn.apache.org/r1610893
Log:
SOLR-2245: Don't use the default date from dataimport.properties and remove duplicated entry in mail-data-config.xml

Modified:
    lucene/dev/trunk/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
    lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/mail-data-config.xml

Modified: lucene/dev/trunk/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java?rev=1610893&r1=1610892&r2=1610893&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java Wed Jul 16 01:17:23 2014
@@ -108,10 +108,19 @@ public class MailEntityProcessor extends
     String varName = ConfigNameConstants.IMPORTER_NS_SHORT + "." + cname + "."
         + DocBuilder.LAST_INDEX_TIME;
     Object varValue = context.getVariableResolver().resolve(varName);
+    if ("1970-01-01 00:00:00".equals(varValue) && 
+        !"".equals(getStringFromContext("fetchMailsSince", ""))) {
+      // favor fetchMailsSince in this case because the value from
+      // dataimport.properties is the default/init value
+      varValue = getStringFromContext("fetchMailsSince", "");
+    }
+    
+    LOG.info(varName+"="+varValue);    
     if (varValue == null || "".equals(varValue)) {
       varName = ConfigNameConstants.IMPORTER_NS_SHORT + "."
           + DocBuilder.LAST_INDEX_TIME;
       varValue = context.getVariableResolver().resolve(varName);
+      LOG.info(varName+"="+varValue);
     }
       
     if (varValue != null && varValue instanceof String) {

Modified: lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/mail-data-config.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/mail-data-config.xml?rev=1610893&r1=1610892&r2=1610893&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/mail-data-config.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/mail-data-config.xml Wed Jul 16 01:17:23 2014
@@ -10,15 +10,3 @@
             name="mail_entity"/>
   </document>
 </dataConfig>
-<dataConfig>
-  <document>
-      <!--
-        Note - In order to index attachments, set processAttachement="true" and drop
-        Tika and its dependencies to example-DIH/solr/mail/lib directory
-       -->
-      <entity processor="MailEntityProcessor" user="email@gmail.com"
-            password="password" host="imap.gmail.com" protocol="gimaps"
-            fetchMailsSince="2014-06-30 00:00:00" batchSize="20" folders="inbox" processAttachement="false"
-            name="mail_entity"/>
-  </document>
-</dataConfig>