svn commit: r1206970 - in /oodt/trunk: ./ xmlps/src/main/java/org/apache/oodt/xmlps/mapping/ xmlps/src/main/java/org/apache/oodt/xmlps/product/ xmlps/src/main/java/org/apache/oodt/xmlps/profile/

[mattmann]

Author: mattmann
Date: Mon Nov 28 04:39:34 2011
New Revision: 1206970

URL: http://svn.apache.org/viewvc?rev=1206970&view=rev
Log:
- fix for OODT-339 MappingReader should add default join table to DatabaseTable 
if none defined (contributed by Ricky Nguyen)

Modified:
    oodt/trunk/CHANGES.txt
    
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReader.java
    
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java
    
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java

Modified: oodt/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1206970&r1=1206969&r2=1206970&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Mon Nov 28 04:39:34 2011
@@ -4,6 +4,9 @@ Apache OODT Change Log
 Release 0.4: Current Development
 --------------------------------------------
 
+* OODT-339 MappingReader should add default join table to DatabaseTable 
+  if none defined (Ricky Nguyen via mattmann)
+
 * OODT-354 CAS-CLI StdCmdLinePrinter doesn't print optional sub-options
   for group options (bfoster)
 

Modified: 
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReader.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReader.java?rev=1206970&r1=1206969&r2=1206970&view=diff
==============================================================================
--- 
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReader.java 
(original)
+++ 
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReader.java 
Mon Nov 28 04:39:34 2011
@@ -97,6 +97,8 @@ public final class MappingReader impleme
       for (int i = 0; i < tableNodes.getLength(); i++) {
         Element tableElem = (Element) tableNodes.item(i);
         DatabaseTable tbl = readTable(tableElem);
+        if (tbl.getDefaultTableJoin() == null || 
tbl.getDefaultTableJoin().isEmpty())
+          tbl.setDefaultTableJoin(map.getDefaultTable());
         map.addTable(tbl.getName(), tbl);
       }
     }

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=1206970&r1=1206969&r2=1206970&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
 Mon Nov 28 04:39:34 2011
@@ -212,9 +212,7 @@ public class XMLPSProductHandler impleme
                 sqlBuf.append(".");
                 sqlBuf.append(tbl.getJoinFieldName());
                 sqlBuf.append(" = ");
-                sqlBuf.append((tbl.getDefaultTableJoin() != null &&
-                        !tbl.getDefaultTableJoin().equals("")) ? tbl
-                        .getDefaultTableJoin() : mapping.getDefaultTable());
+                sqlBuf.append(tbl.getDefaultTableJoin());
                 sqlBuf.append(".");
                 sqlBuf.append(tbl.getDefaultTableJoinFieldName());
                 sqlBuf.append(" ");

Modified: 
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java?rev=1206970&r1=1206969&r2=1206970&view=diff
==============================================================================
--- 
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java
 (original)
+++ 
oodt/trunk/xmlps/src/main/java/org/apache/oodt/xmlps/profile/XMLPSProfileHandler.java
 Mon Nov 28 04:39:34 2011
@@ -167,9 +167,7 @@ public class XMLPSProfileHandler extends
                 sqlBuf.append(".");
                 sqlBuf.append(tbl.getJoinFieldName());
                 sqlBuf.append(" = ");
-                sqlBuf.append((tbl.getDefaultTableJoin() != null && !tbl
-                        .getDefaultTableJoin().equals("")) ? tbl
-                        .getDefaultTableJoin() : mapping.getDefaultTable());
+                sqlBuf.append(tbl.getDefaultTableJoin());
                 sqlBuf.append(".");
                 sqlBuf.append(tbl.getDefaultTableJoinFieldName());
                 sqlBuf.append(" ");