Author: saminda
Date: Wed Dec 5 06:07:57 2007
New Revision: 10557
Log:
Fixed JIRA-634 with other XSL issues
Modified:
trunk/wsas/java/modules/www/extensions/core/js/data_service.js
trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_operatoin_query.xsl
trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl
Modified: trunk/wsas/java/modules/www/extensions/core/js/data_service.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/data_service.js
(original)
+++ trunk/wsas/java/modules/www/extensions/core/js/data_service.js Wed Dec
5 06:07:57 2007
@@ -414,6 +414,14 @@
//TODO: note edit query
function editSpecificQuery(query, sql) {
+ if (query == null || query.length == 0) {
+ wso2.wsf.Util.alertWarning("Query id is required.");
+ return;
+ }
+ if (sql == null || sql.length == 0) {
+ wso2.wsf.Util.alertWarning("Sql statement is required.");
+ return;
+ }
var qArray = dataServiceObj.getElementsByTagName("query");
var qEle;
for (var i = 0; i < qArray.length; i++) {
@@ -431,8 +439,12 @@
if (eSql) {
eSql.removeChild(eSql.childNodes.item(0));
eSql.appendChild(rootDocument.createCDATASection(sql));
+ } else {
+ eSql = rootDocument.createElement('sql');
+ eSql.appendChild(rootDocument.createCDATASection(sql));
+ qEle.appendChild(eSql);
}
- //TODO: reslut
+
var rArray = qEle.getElementsByTagName('result');
var rEle = null;
for (i = 0; i < rArray.length; i++) {
@@ -1104,7 +1116,7 @@
}
//TODO : note : add new output mapping.
-function addNewOutPutMappingForQuery(queryId) {
+function addNewOutPutMappingForQuery(queryId, sql) {
if (!queryId) {
wso2.wsf.Util.alertWarning("Required queryId before adding output
mapping.");
return;
@@ -1123,6 +1135,21 @@
dataServiceObj.getElementsByTagName("data").item(0).appendChild(queryEle);
}
+ var sqlArray = queryEle.getElementsByTagName('sql');
+ var sqlEle = null;
+ for (i = 0; i < sqlArray.length; i++) {
+ sqlEle = sqlArray[i];
+ break;
+ }
+ if (!sqlEle) {
+ sqlEle = rootDocument.createElement("sql");
+ sqlEle.appendChild(rootDocument.createTextNode(sql));
+ queryEle.appendChild(sqlEle);
+ } else {
+ sqlEle.removeChild(sqlEle.childNodes.item(0));
+ sqlEle.appendChild(rootDocument.createTextNode(sql));
+ }
+
//TODO : create the reslut element if not vailable
var resultArray = queryEle.getElementsByTagName('result');
var resultEle = null;
Modified:
trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_operatoin_query.xsl
==============================================================================
---
trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_operatoin_query.xsl
(original)
+++
trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_operatoin_query.xsl
Wed Dec 5 06:07:57 2007
@@ -144,7 +144,7 @@
</xsl:choose>
</xsl:if>
<xsl:if test="$operationName">
-
holderObject["queryNameForOperation1234UUURRX"] = '<xsl:value-of
select="$query/@id"/>';
+
holderObject["queryNameForOperation1234UUURRX"] = '<xsl:value-of
select="$callQuery/@href"/>';
<xsl:choose>
<xsl:when test="$callQuery/with-param">
<xsl:for-each
select="$callQuery/with-param">
Modified:
trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl
(original)
+++ trunk/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl
Wed Dec 5 06:07:57 2007
@@ -175,7 +175,7 @@
</xsl:otherwise>
</xsl:choose>
<div>
- <input type="button"
onClick="addNewOutPutMappingForQuery(document.getElementById('txtDataServiceQueryId').value);
return false;" value="Add New OutputMapping"/>
+ <input type="button"
onClick="addNewOutPutMappingForQuery(document.getElementById('txtDataServiceQueryId').value,
document.getElementById('txtDataServiceSQL').value); return false;" value="Add
New OutputMapping"/>
<xsl:if test="$groupByEle">
<input type="button"
onClick="removeResultElement(document.getElementById('txtDataServiceQueryId').value,document.getElementById('txtDataServiceWrapElement').value);
return false;" value="Clear Result"/>
</xsl:if>
_______________________________________________
Wsas-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
