[wsas-java-dev] svn commit r18004 - branches/wsas/java/2.3/data-service-solution/modules/core/src/main/java/org/wso2/ws/dataservice

[sumedha]

Author: sumedha
Date: Thu Jun  5 04:22:40 2008
New Revision: 18004
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=18004

Log:
Support for attribute type results for excel & CSV

Modified:
   
branches/wsas/java/2.3/data-service-solution/modules/core/src/main/java/org/wso2/ws/dataservice/DBUtils.java

Modified: 
branches/wsas/java/2.3/data-service-solution/modules/core/src/main/java/org/wso2/ws/dataservice/DBUtils.java
URL: 
http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/data-service-solution/modules/core/src/main/java/org/wso2/ws/dataservice/DBUtils.java?rev=18004&r1=18003&r2=18004&view=diff
==============================================================================
--- 
branches/wsas/java/2.3/data-service-solution/modules/core/src/main/java/org/wso2/ws/dataservice/DBUtils.java
        (original)
+++ 
branches/wsas/java/2.3/data-service-solution/modules/core/src/main/java/org/wso2/ws/dataservice/DBUtils.java
        Thu Jun  5 04:22:40 2008
@@ -950,7 +950,11 @@
                                Iterator elements = result.getChildElements();
                                while (elements.hasNext()) {
                                        OMElement element = (OMElement) 
elements.next();
-                                       if 
(element.getLocalName().equals("element")) {
+                                       //can be one of 
'element','attribute','text','link' or 'header' 
+                                       String outPutElementType = 
element.getLocalName();
+                                       
+                                       if (outPutElementType.equals("element")
+                                                       || 
outPutElementType.equals("attribute")) {
                                                String displayTagName = 
element.getAttributeValue(new QName("name"));
                                                String columnValue = 
element.getAttributeValue(new QName("column"));
 
@@ -986,11 +990,11 @@
                                                        }
                                                }
 
-                                               if (columnDefalut == null || 
columnDefalut.equals("element")) {
+                                               if 
(outPutElementType.equals("element")) {
                                                        OMElement rowElement = 
fac.createOMElement(displayTagName, omNs);
                                                        
rowElement.addChild(fac.createOMText(rowElement, elementValue));
                                                        
row.addChild(rowElement);
-                                               } else if 
(columnDefalut.equals("attribute")) {
+                                               } else if 
(outPutElementType.equals("attribute")) {
                                                        
row.addAttribute(displayTagName, elementValue, omNs);
                                                }
                                        }
@@ -1230,7 +1234,11 @@
                                Iterator elements = result.getChildElements();
                                while (elements.hasNext()) {
                                        OMElement element = (OMElement) 
elements.next();
-                                       if 
(element.getLocalName().equals("element")) {
+                                       
+                                       //can be one of 
'element','attribute','text','link' or 'header' 
+                                       String outPutElementType = 
element.getLocalName();                                      
+                                       if (outPutElementType.equals("element")
+                                                       || 
outPutElementType.equals("attribute")) {
                                                String displayTagName = 
element.getAttributeValue(new QName("name"));
                                                String columnReference =
                                                        
element.getAttributeValue(new QName("column"));
@@ -1248,11 +1256,11 @@
                                                //in dbs file column number 
starts from 1, but inside code it starts from 0
                                                String elementValue = (String) 
elementValues.get(new Integer(columnRef - 1));
 
-                                               if (columnDefalut == null || 
columnDefalut.equals("element")) {
+                                               if 
(outPutElementType.equals("element")) {
                                                        OMElement rowElement = 
fac.createOMElement(displayTagName, omNs);
                                                        
rowElement.addChild(fac.createOMText(rowElement, elementValue));
                                                        
row.addChild(rowElement);
-                                               } else if 
(columnDefalut.equals("attribute")) {
+                                               } else if 
(outPutElementType.equals("attribute")) {
                                                        
row.addAttribute(displayTagName, elementValue, omNs);
                                                }
                                        }

_______________________________________________
Wsas-java-dev mailing list
Wsas-java-dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev