Author: sumedha Date: Mon Jun 2 04:18:56 2008 New Revision: 17780 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=17780
Log: copying wsas2.2 changes to trunk Modified: trunk/wsas/java/modules/www/extensions/core/js/data_service.js Modified: trunk/wsas/java/modules/www/extensions/core/js/data_service.js URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/www/extensions/core/js/data_service.js?rev=17780&r1=17779&r2=17780&view=diff ============================================================================== --- trunk/wsas/java/modules/www/extensions/core/js/data_service.js (original) +++ trunk/wsas/java/modules/www/extensions/core/js/data_service.js Mon Jun 2 04:18:56 2008 @@ -510,24 +510,43 @@ } var rgName = document.getElementById('txtDataServiceWrapElement').value; var rowName = document.getElementById('txtDataServiceRowName').value; - if (rgName == null || rgName.length == 0) { - wso2.wsf.Util.alertWarning("Group by element is required"); - return; - } - if (rowName == null || rowName.length == 0) { - wso2.wsf.Util.alertWarning("Row name element is required"); - return; - } + var rowNamespace = document.getElementById('txtDataServiceRowNamespace').value; + + if (!rEle) { - rEle = rootDocument.createElement("result"); - rEle.setAttribute("element", rgName); - rEle.setAttribute("rowName", rowName); - qEle.appendChild(rEle); + rEle = rootDocument.createElement("result"); + if (!(rgName == null || rgName.length == 0)) { + rEle.setAttribute("element", rgName); + } + if (!(rowName == null || rowName.length == 0)) { + rEle.setAttribute("rowName", rowName); + } + if (!(rowNamespace == null || rowNamespace.length == 0)) { + rEle.setAttribute("defaultNamespace", rowNamespace); + }else{ + rEle.removeAttribute("defaultNamespace"); + } + //if rowname & row group name is null, do not set result element + if(!(rEle.getAttribute("element") == null && rEle.getAttribute("rowName") == null)){ + qEle.appendChild(rEle); + } } else { rEle.removeAttribute("element"); rEle.removeAttribute("rowName"); - rEle.setAttribute("element", rgName); - rEle.setAttribute("rowName", rowName); + rEle.removeAttribute("defaultNamespace"); + if (!(rgName == null || rgName.length == 0)) { + rEle.setAttribute("element", rgName); + } + if (!(rowName == null || rowName.length == 0)) { + rEle.setAttribute("rowName", rowName); + } + if (!(rowNamespace == null || rowNamespace.length == 0)) { + rEle.setAttribute("defaultNamespace", rowNamespace); + } + //if rowname & row group name is null, do not set result element + if(rEle.getAttribute("element") == null || rEle.getAttribute("rowName") == null){ + qEle.removeChild(rEle); + } } refreshDataServiceScreen(); } @@ -1113,7 +1132,7 @@ break; } var mappingValue = mappingObj[mappingObj.selectedIndex].value; - if (mappingValue == 'Element') { + if (mappingValue == 'Element' || mappingValue == 'Attribute') { var name = document.getElementById('txtDataServiceOMElementName').value; var column = document.getElementById('txtDataServiceOMColumnName').value; if (name == null || name.length == 0) { @@ -1124,7 +1143,15 @@ wso2.wsf.Util.alertWarning("SQL column name is required"); return; } - var eEleArray = resultEle.getElementsByTagName('element'); + var eEleArray = null; + if (mappingValue == 'Element') { + eEleArray = resultEle.getElementsByTagName('element'); + } else if (mappingValue == 'Attribute') { + eEleArray = resultEle.getElementsByTagName('attribute'); + } else { + wso2.wsf.Util.alertWarning("Mapping Type is not available"); + return; + } var eEle1 = null; if (name == oldOutputFieldName) { //same elements and in the editing stage @@ -1152,7 +1179,11 @@ wso2.wsf.Util.alertWarning("Element already exist with the name " + name); return; } - eEle1 = rootDocument.createElement("element"); + if (mappingValue == 'Element') { + eEle1 = rootDocument.createElement("element"); + } else { + eEle1 = rootDocument.createElement("attribute"); + } eEle1.setAttribute("name", name); eEle1.setAttribute("column", column); resultEle.appendChild(eEle1); @@ -1174,7 +1205,11 @@ } } resultEle.removeChild(eEle1); - eEle1 = rootDocument.createElement("element"); + if (mappingValue == 'Element') { + eEle1 = rootDocument.createElement("element"); + } else { + eEle1 = rootDocument.createElement("attribute"); + } eEle1.setAttribute("name", name); eEle1.setAttribute("column", column); resultEle.appendChild(eEle1); @@ -1346,6 +1381,13 @@ showYUIPanel("Edit Output Mapping ", divInnerHtml, "600px", "step2Inner10", "divADDEditOutputMapping"); } +//TODO: note edit query output mapping attribute +function editQueryOutputMappingAttribute(queryId, atName, colName) { + var divInnerHtml = yuiTransformer(dataServiceObj, "data_service_add_edit_result_mapping.xsl", false, [["queryId",queryId],["atName",atName],["colName", colName]]); + showYUIPanel("Edit Output Mapping ", divInnerHtml, "600px", "step2Inner10", "divADDEditOutputMapping"); + +} + function editQueryOutputMappingCallQuery(queryId, queryHref) { var divInnerHtml = yuiTransformer(dataServiceObj, "data_service_add_edit_result_mapping.xsl", false, [["queryId",queryId],["queryHref", queryHref]]); showYUIPanel("Add New Output Mapping ", divInnerHtml, "600px", "step2Inner10", "divADDEditOutputMapping"); @@ -1505,6 +1547,16 @@ } } resultEle.removeChild(cqEle); + } else if (mappingType == "Attribute") { + var atArray = resultEle.getElementsByTagName('attribute'); + var atEle = null; + for (i = 0; i < eArray.length; i++) { + if (atArray[i].getAttribute('name') == commonName) { + atEle = atArray[i]; + break; + } + } + resultEle.removeChild(atEle); } var currentDiv = document.getElementById("divADDEditOutputMapping"); currentDiv.style.display = "none"; @@ -1587,27 +1639,55 @@ } var rgName = document.getElementById('txtDataServiceWrapElement').value; var rowName = document.getElementById('txtDataServiceRowName').value; - if (rgName == null || rgName.length == 0) { - wso2.wsf.Util.alertWarning("Group by element is required"); - return; - } - if (rowName == null || rowName.length == 0) { - wso2.wsf.Util.alertWarning("Row name element is required"); - return; - } + var rowNamespace = document.getElementById('txtDataServiceRowNamespace').value; + if (!rEle) { - rEle = rootDocument.createElement("result"); - rEle.setAttribute("element", rgName); - rEle.setAttribute("rowName", rowName); - queryEle.appendChild(rEle); + rEle = rootDocument.createElement("result"); + if (!(rgName == null || rgName.length == 0)) { + rEle.setAttribute("element", rgName); + } + if (!(rowName == null || rowName.length == 0)) { + rEle.setAttribute("rowName", rowName); + } + if (!(rowNamespace == null || rowNamespace.length == 0)) { + rEle.setAttribute("defaultNamespace", rowNamespace); + }else{ + rEle.removeAttribute("defaultNamespace"); + } + //if rowname & row group name is null, do not set result element + if(!(rEle.getAttribute("element") == null && rEle.getAttribute("rowName") == null)){ + qEle.appendChild(rEle); + } } else { rEle.removeAttribute("element"); rEle.removeAttribute("rowName"); - rEle.setAttribute("element", rgName); - rEle.setAttribute("rowName", rowName); + rEle.removeAttribute("defaultNamespace"); + if (!(rgName == null || rgName.length == 0)) { + rEle.setAttribute("element", rgName); + } + if (!(rowName == null || rowName.length == 0)) { + rEle.setAttribute("rowName", rowName); + } + if (!(rowNamespace == null || rowNamespace.length == 0)) { + rEle.setAttribute("defaultNamespace", rowNamespace); + } + //if rowname & row group name is null, do not set result element + if(rEle.getAttribute("element") == null || rEle.getAttribute("rowName") == null){ + qEle.removeChild(rEle); + } } + if ("EXCEL" == dataServiceObj.getAttribute("dataSourceType")) { + if (rgName == null || rgName.length == 0) { + wso2.wsf.Util.alertWarning("Group by element is required"); + return; + } + if (rowName == null || rowName.length == 0) { + wso2.wsf.Util.alertWarning("Row name element is required"); + return; + } + //sqlEle.appendChild(rootDocument.createTextNode("UseSheet=0:StartReadingFromRow=1")); //create excel elements var excelElement = rootDocument.createElement("excel"); @@ -1661,6 +1741,14 @@ sqlEle.appendChild(sqlEleTextNode); queryEle.appendChild(sqlEle); } else if ("CSV" == dataServiceObj.getAttribute("dataSourceType")) { + if (rgName == null || rgName.length == 0) { + wso2.wsf.Util.alertWarning("Group by element is required"); + return; + } + if (rowName == null || rowName.length == 0) { + wso2.wsf.Util.alertWarning("Row name element is required"); + return; + } } /*var resultEle = rootDocument.createElement("result"); @@ -1671,7 +1759,6 @@ refreshDataServiceScreen(); } - var dataServiceNewQuery = false; function addDataServiceQuery() { _______________________________________________ Wsas-java-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
