Repository: oodt Updated Branches: refs/heads/master 4b61d06fc -> 15511f20d
OODT-924 fix missing metadata field in solr resultset Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/15511f20 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/15511f20 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/15511f20 Branch: refs/heads/master Commit: 15511f20d3ac53aba2f8e122f06823b22f916848 Parents: 4b61d06 Author: Tom Barber <[email protected]> Authored: Wed Feb 10 18:28:45 2016 +0000 Committer: Tom Barber <[email protected]> Committed: Wed Feb 10 18:28:45 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../catalog/solr/DefaultProductSerializer.java | 6 +++--- .../org/apache/oodt/cas/filemgr/structs/Product.java | 15 +++++++++++---- .../apache/oodt/cas/filemgr/structs/ProductType.java | 1 + 4 files changed, 17 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/15511f20/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 311b75a..0a4445f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,6 +6,8 @@ Release 0.12 - Under development * OODT-923 Fix start script for solr deployments (magicaltrout) +* OODT-924 Fix missing timestamp metadata field in returned data from solr (magicaltrout) + Release 0.11 - 12/29/2015 * OODT-918 - Created a prerequisite workflow condition for DRAT (Karanjeet http://git-wip-us.apache.org/repos/asf/oodt/blob/15511f20/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/DefaultProductSerializer.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/DefaultProductSerializer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/DefaultProductSerializer.java index 7a0d14e..72180e3 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/DefaultProductSerializer.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/solr/DefaultProductSerializer.java @@ -457,9 +457,9 @@ public class DefaultProductSerializer implements ProductSerializer { } else if (name.equals(Parameters.PRODUCT_TYPE_ID)) { productType.setProductTypeId(value); } else if (name.equals(Parameters.PRODUCT_RECEIVED_TIME)) { - // ignore ? - - // CAS root reference + product.setProductRecievedTime(value); + metadata.addMetadata(name, value); + // CAS root reference } else if (name.startsWith(Parameters.NS+Parameters.ROOT)) { if (rootReference==null) { rootReference = new Reference(); http://git-wip-us.apache.org/repos/asf/oodt/blob/15511f20/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java index f857cbd..ef79439 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Product.java @@ -17,8 +17,6 @@ package org.apache.oodt.cas.filemgr.structs; -//JDK imports - import org.apache.oodt.cas.filemgr.exceptions.FileManagerException; import org.apache.oodt.commons.xml.XMLUtils; import org.w3c.dom.Document; @@ -39,8 +37,6 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -//OODT imports - /** * @author mattmann * @author bfoster @@ -98,6 +94,7 @@ public class Product { /* our log stream */ private static final Logger LOG = Logger.getLogger(Product.class.getName()); + private String productReceivedTime; /** * <p> * Default Constructor @@ -362,5 +359,15 @@ public class Product { } } + /** + * Set time product was ingested. + * @param productRecievedTime + */ + public void setProductRecievedTime(String productReceivedTime) { + this.productReceivedTime = productReceivedTime; + } + public String getProductReceivedTime() { + return productReceivedTime; + } } http://git-wip-us.apache.org/repos/asf/oodt/blob/15511f20/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ProductType.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ProductType.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ProductType.java index aea6d99..88eb9dc 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ProductType.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/ProductType.java @@ -201,4 +201,5 @@ public class ProductType { return this.name; } + }
