Author: mattmann
Date: Sat Sep 1 21:13:29 2012
New Revision: 1379861
URL: http://svn.apache.org/viewvc?rev=1379861&view=rev
Log:
- fix for OODT-432: Add FileSize to know metadata fields set by CAS-Crawler
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/action/MimeTypeCrawlerAction.java
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/config/ProductCrawlerBean.java
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1379861&r1=1379860&r2=1379861&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Sat Sep 1 21:13:29 2012
@@ -4,6 +4,9 @@ Apache OODT Change Log
Release 0.5
--------------------------------------------
+* OODT-432: Add FileSize to know metadata fields set by CAS-Crawler
+ (bfoster via mattmann)
+
* OODT-381: Create Runner framework to allow flexible WorkflowTask
execution on different runtimes (mattmann, bfoster)
Modified:
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java?rev=1379861&r1=1379860&r2=1379861&view=diff
==============================================================================
---
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java
(original)
+++
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/AutoDetectProductCrawler.java
Sat Sep 1 21:13:29 2012
@@ -70,6 +70,8 @@ import org.springframework.beans.factory
public class AutoDetectProductCrawler extends ProductCrawler implements
CoreMetKeys {
+ public static final String MIME_TYPES_HIERARCHY = "MimeTypesHierarchy";
+
private MimeExtractorRepo mimeExtractorRepo;
@Override
Modified:
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java?rev=1379861&r1=1379860&r2=1379861&view=diff
==============================================================================
---
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java
(original)
+++
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/ProductCrawler.java
Sat Sep 1 21:13:29 2012
@@ -262,19 +262,23 @@ public abstract class ProductCrawler ext
@VisibleForTesting void addKnownMetadata(File product,
Metadata productMetadata) {
// Add ProductName if not specified.
- if (productMetadata.getMetadata(CoreMetKeys.PRODUCT_NAME) == null) {
- productMetadata.addMetadata(
- CoreMetKeys.PRODUCT_NAME, product.getName());
+ if (!productMetadata.containsKey(PRODUCT_NAME)) {
+ productMetadata.addMetadata(PRODUCT_NAME, product.getName());
}
// Add Filename if not specified.
- if (productMetadata.getMetadata(CoreMetKeys.FILENAME) == null) {
- productMetadata.addMetadata(CoreMetKeys.FILENAME, product.getName());
+ if (!productMetadata.containsKey(FILENAME)) {
+ productMetadata.addMetadata(FILENAME, product.getName());
}
// Add FileLocation if not specified.
- if (productMetadata.getMetadata(CoreMetKeys.FILE_LOCATION) == null) {
- productMetadata.addMetadata(CoreMetKeys.FILE_LOCATION, product
+ if (!productMetadata.containsKey(FILE_LOCATION)) {
+ productMetadata.addMetadata(FILE_LOCATION, product
.getAbsoluteFile().getParentFile().getAbsolutePath());
}
+ // Add FileSize if not specified
+ if (!productMetadata.containsKey(FILE_SIZE)) {
+ productMetadata.addMetadata(FILE_SIZE,
+ Long.toString(product.length()));
+ }
}
@VisibleForTesting IngestStatus createIngestStatus(final File product,
Modified:
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/action/MimeTypeCrawlerAction.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/action/MimeTypeCrawlerAction.java?rev=1379861&r1=1379860&r2=1379861&view=diff
==============================================================================
---
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/action/MimeTypeCrawlerAction.java
(original)
+++
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/action/MimeTypeCrawlerAction.java
Sat Sep 1 21:13:29 2012
@@ -17,7 +17,7 @@
package org.apache.oodt.cas.crawl.action;
//OODT static imports
-import static
org.apache.oodt.cas.crawl.config.ProductCrawlerBean.MIME_TYPES_HIERARCHY;
+import static
org.apache.oodt.cas.crawl.AutoDetectProductCrawler.MIME_TYPES_HIERARCHY;
//Apache imports
import org.apache.commons.lang.Validate;
Modified:
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/config/ProductCrawlerBean.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/config/ProductCrawlerBean.java?rev=1379861&r1=1379860&r2=1379861&view=diff
==============================================================================
---
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/config/ProductCrawlerBean.java
(original)
+++
oodt/trunk/crawler/src/main/java/org/apache/oodt/cas/crawl/config/ProductCrawlerBean.java
Sat Sep 1 21:13:29 2012
@@ -59,8 +59,6 @@ public abstract class ProductCrawlerBean
private Metadata globalMetadata;
- public static final String MIME_TYPES_HIERARCHY = "MimeTypesHierarchy";
-
public ProductCrawlerBean() {
this.actionIds = new LinkedList<String>();
this.requiredMetadata = new HashSet<String>();
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java?rev=1379861&r1=1379860&r2=1379861&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java
(original)
+++
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/metadata/CoreMetKeys.java
Sat Sep 1 21:13:29 2012
@@ -35,7 +35,9 @@ public interface CoreMetKeys {
public static final String FILE_LOCATION = "FileLocation";
public static final String FILENAME = "Filename";
-
+
+ public static final String FILE_SIZE = "FileSize";
+
public static final String PRODUCT_TYPE = "ProductType";
public static final String PRODUCT_STRUCTURE = "ProductStructure";
