svn commit: r1631954 - in /manifoldcf/branches/dev_1x: ./ CHANGES.txt connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java

[kwright]

Author: kwright
Date: Wed Oct 15 06:42:54 2014
New Revision: 1631954

URL: http://svn.apache.org/r1631954
Log:
Pull up fix for CONNECTORS-1071 from trunk

Modified:
    manifoldcf/branches/dev_1x/   (props changed)
    manifoldcf/branches/dev_1x/CHANGES.txt
    
manifoldcf/branches/dev_1x/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java

Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1631953

Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1631954&r1=1631953&r2=1631954&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Wed Oct 15 06:42:54 2014
@@ -3,6 +3,11 @@ $Id$
 
 ======================= 1.8-dev =====================
 
+CONNECTORS-1071: JCIFS connector should provide date metadata in
+standard ISO8601 format with names that don't conflict with what
+Tika extractor generates.
+(Antonio David Pérez Morales, Karl Wright)
+
 CONNECTORS-1053: Provide stop scripts for single-process examples.
 (Shinichiro Abe, Karl Wright)
 

Modified: 
manifoldcf/branches/dev_1x/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java?rev=1631954&r1=1631953&r2=1631954&view=diff
==============================================================================
--- 
manifoldcf/branches/dev_1x/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
 (original)
+++ 
manifoldcf/branches/dev_1x/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
 Wed Oct 15 06:42:54 2014
@@ -70,6 +70,7 @@ import org.apache.manifoldcf.crawler.int
 import org.apache.manifoldcf.crawler.system.Logging;
 import org.apache.manifoldcf.crawler.system.ManifoldCF;
 import org.apache.manifoldcf.core.extmimemap.ExtensionMimeMap;
+import org.apache.manifoldcf.core.common.DateParser;
 
 /** This is the "repository connector" for a smb/cifs shared drive file 
system.  It's a relative of the share crawler, and should have
 * comparable basic functionality.
@@ -826,10 +827,12 @@ public class SharedDriveConnector extend
                 if (contentType != null)
                   rd.setMimeType(contentType);
                 rd.addField("lastModified", lastModifiedDate.toString());
+                
rd.addField("fileLastModified",DateParser.formatISO8601Date(lastModifiedDate));
                 rd.setModifiedDate(lastModifiedDate);
                 
                 // Add extra obtainable fields to the field map
                 rd.addField("createdOn", creationDate.toString());
+                
rd.addField("fileCreatedOn",DateParser.formatISO8601Date(creationDate));
                 rd.setCreatedDate(creationDate);
 
                 //rd.addField("lastAccess", lastModifiedDate.toString());