svn commit: r1492950 - in /oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps: product/XMLPSProductHandler.java profile/DBMSExecutor.java structs/CDEResult.java

[joyce]

Author: joyce
Date: Fri Jun 14 04:26:52 2013
New Revision: 1492950

URL: http://svn.apache.org/r1492950
Log:
Resolve OODT-627. Fix XMLPS mapping function attributes being applied backwards.

Modified:
    
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java
    
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
    oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java

Modified: 
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java?rev=1492950&r1=1492949&r2=1492950&view=diff
==============================================================================
--- 
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java
 (original)
+++ 
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java
 Fri Jun 14 04:26:52 2013
@@ -330,7 +330,7 @@ public class XMLPSProductHandler impleme
                         MappingFunc func = j.next();
                         CDEValue origVal = new CDEValue(fld.getName(),
                                 litElem.getValue());
-                        CDEValue newVal = func.translate(origVal);
+                        CDEValue newVal = func.inverseTranslate(origVal);
                         litElem.setValue(newVal.getVal());
                     }
 

Modified: 
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java?rev=1492950&r1=1492949&r2=1492950&view=diff
==============================================================================
--- 
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java 
(original)
+++ 
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/profile/DBMSExecutor.java 
Fri Jun 14 04:26:52 2013
@@ -144,7 +144,7 @@ public class DBMSExecutor {
           for (Iterator<MappingFunc> j = fld.getFuncs().iterator(); 
j.hasNext();) {
             MappingFunc func = j.next();
             CDEValue origVal = new CDEValue(fld.getName(), elemDbVal);
-            CDEValue newVal = func.inverseTranslate(origVal);
+            CDEValue newVal = func.translate(origVal);
             elemDbVal = newVal.getVal();
           }
 

Modified: 
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java?rev=1492950&r1=1492949&r2=1492950&view=diff
==============================================================================
--- oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java 
(original)
+++ oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java 
Fri Jun 14 04:26:52 2013
@@ -149,7 +149,7 @@ public class CDEResult extends Result {
       MappingField fld = mapping.getFieldByName(value.getCdeName());
       if (fld != null) {
         for (MappingFunc func : fld.getFuncs()) {
-          CDEValue newValue = func.inverseTranslate(value);
+          CDEValue newValue = func.translate(value);
           value.setVal(newValue.getVal());
         }
       }