[metcat] r188 committed - search index label change to a.b.c notation

[metcat.apach...@codespot.com]

Revision: 188
Author: uisurumad...@gmail.com
Date: Tue Aug 28 22:12:59 2012
Log: search index label change to a.b.c notation
http://code.google.com/a/apache-extras.org/p/metcat/source/detail?r=188

Modified:

/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/parser/impl/LogBasicParser.java

/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/parser/impl/ServiceProvenanceBasicParser.java

/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/parser/impl/WorkflowProvenanceBasicParser.java

=======================================
---
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/parser/impl/LogBasicParser.java
Tue Aug 28 19:46:59 2012
+++
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/parser/impl/LogBasicParser.java
Tue Aug 28 22:12:59 2012
@@ -72,7 +72,8 @@
if (result.get(attr.getLabel()) == null) continue;
if(attr.isIndex()){
String value = result.get(attr.getLabel());
- String indexRowID = attr.getLabel();
+ String indexRowID =
attr.getXPath().replaceAll("/", ".").replaceAll("@", "");
+ if (indexRowID.startsWith("..")) indexRowID = indexRowID.substring(2);
String indexColumnKey = value + DataModel.PART_DELIMETER + timestamp;
String tempWorkflowID = workflowID != null? workflowID : experimentID;
String eventID = this.getEventName() + DataModel.PART_DELIMETER +
timestamp + DataModel.PART_DELIMETER + tempWorkflowID;
=======================================
---
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/parser/impl/ServiceProvenanceBasicParser.java
Tue Aug 28 19:46:59 2012
+++
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/parser/impl/ServiceProvenanceBasicParser.java
Tue Aug 28 22:12:59 2012
@@ -61,7 +61,8 @@

/*creating index*/
if(attr.isIndex()){
- String indexRowID = attr.getLabel();
+ String indexRowID =
attr.getXPath().replaceAll("/", ".").replaceAll("@", "");
+ if (indexRowID.startsWith("..")) indexRowID = indexRowID.substring(2);
String indexColumnKey = attributeValue + DataModel.PART_DELIMETER +
timestamp;
String tempWorkflowID = workflowID != null? workflowID : experimentID;
String eventID = this.getEventName() + DataModel.PART_DELIMETER +
timestamp + DataModel.PART_DELIMETER + tempWorkflowID;
=======================================
---
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/parser/impl/WorkflowProvenanceBasicParser.java
Tue Aug 28 19:46:59 2012
+++
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/parser/impl/WorkflowProvenanceBasicParser.java
Tue Aug 28 22:12:59 2012
@@ -62,7 +62,8 @@
if (result.get(attr.getLabel()) == null) continue;
if(attr.isIndex()){
String value = result.get(attr.getLabel());
- String indexRowID = attr.getLabel();
+ String indexRowID =
attr.getXPath().replaceAll("/", ".").replaceAll("@", "");
+ if (indexRowID.startsWith("..")) indexRowID = indexRowID.substring(2);
String indexColumnKey = value + DataModel.PART_DELIMETER + timestamp;
String indexColumnValue = workflowID != null? workflowID :
experimentID;