You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by th...@apache.org on 2012/04/18 10:11:01 UTC
svn commit: r1327418 - in /oodt/trunk: CHANGES.txt
filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
Author: thomas
Date: Wed Apr 18 08:11:00 2012
New Revision: 1327418
URL: http://svn.apache.org/viewvc?rev=1327418&view=rev
Log:
OODT-440: Replace legacy getMetadata("UUID") calls with getMetadata("CAS." + CoreMetKeys.PRODUCT_ID)
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
Modified: oodt/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1327418&r1=1327417&r2=1327418&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Wed Apr 18 08:11:00 2012
@@ -4,6 +4,9 @@ Apache OODT Change Log
Release 0.4: Current Development
--------------------------------------------
+* OODT-440 Replace legacy getMetadata("UUID") calls with
+ getMetadata("CAS." + CoreMetKeys.PRODUCT_ID) (thomas)
+
* OODT-442 Apache project branding requirements: DOAP
file [PATCH] (Shane Curcuru via mattmann)
Modified: oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
URL: http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java?rev=1327418&r1=1327417&r2=1327418&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java (original)
+++ oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java Wed Apr 18 08:11:00 2012
@@ -50,6 +50,7 @@ import org.apache.solr.common.SolrInputD
import org.apache.solr.core.CoreContainer;
//OODT imports
+import org.apache.oodt.cas.filemgr.metadata.CoreMetKeys;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductType;
import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
@@ -176,7 +177,7 @@ public class SolrIndexer {
SerializableMetadata metadata = new SerializableMetadata("UTF-8", false);
metadata.loadMetadataFromXmlStream(new FileInputStream(file));
if (delete) {
- server.deleteById(metadata.getMetadata("uuid"));
+ server.deleteById(metadata.getMetadata("CAS." + CoreMetKeys.PRODUCT_ID));
}
server.add(this.getSolrDocument(metadata));
}
@@ -201,24 +202,24 @@ public class SolrIndexer {
Metadata metadata = fmClient.getMetadata(product);
if (metadata != null) {
LOG.info("Found metadata for product ID "
- + metadata.getMetadata("CAS.ProductId"));
+ + metadata.getMetadata("CAS." + CoreMetKeys.PRODUCT_ID));
} else {
LOG.info("Could not find metadata for product "
+ product.getProductId());
}
- if (metadata.getMetadata("UUID") != null) {
+ if (metadata.getMetadata("CAS." + CoreMetKeys.PRODUCT_ID) != null) {
if (metadata.getMetadata("Deleted") == null
|| !"true".equals(metadata.getMetadata("Deleted"))) {
try {
server.add(this.getSolrDocument(metadata));
server.commit();
- LOG.info("Indexed " + metadata.getMetadata("UUID"));
+ LOG.info("Indexed " + metadata.getMetadata("CAS." + CoreMetKeys.PRODUCT_ID));
} catch (Exception e) {
- LOG.severe("Could not index " + metadata.getMetadata("UUID")
+ LOG.severe("Could not index " + metadata.getMetadata("CAS." + CoreMetKeys.PRODUCT_ID)
+ " " + e.getMessage());
}
} else {
- LOG.info("Skipping Deleted: " + metadata.getMetadata("UUID"));
+ LOG.info("Skipping Deleted: " + metadata.getMetadata("CAS." + CoreMetKeys.PRODUCT_ID));
}
}
}