Author: sumedha
Date: Tue Jan 15 05:26:15 2008
New Revision: 12267
Log:
added input type and ordinal fields - for stored procedures
Modified:
branches/wsas/java/2.2-SNSPSHOT/wsas/java/modules/www/extensions/core/js/data_service.js
branches/wsas/java/2.2-SNSPSHOT/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_input_mapping.xsl
branches/wsas/java/2.2-SNSPSHOT/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_operatoin_query.xsl
branches/wsas/java/2.2-SNSPSHOT/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl
Modified:
branches/wsas/java/2.2-SNSPSHOT/wsas/java/modules/www/extensions/core/js/data_service.js
==============================================================================
---
branches/wsas/java/2.2-SNSPSHOT/wsas/java/modules/www/extensions/core/js/data_service.js
(original)
+++
branches/wsas/java/2.2-SNSPSHOT/wsas/java/modules/www/extensions/core/js/data_service.js
Tue Jan 15 05:26:15 2008
@@ -331,7 +331,7 @@
showYUIPanel("Add New Input Param", divInnerHtml, "600px", "step2Inner3",
"divADDEditInputMapping");
}
-function addNewSpecificInputParam(queryId, paramName, obj, oldInputParamName) {
+function addNewSpecificInputParam(queryId, paramName,
obj,ordinalValue,inOutObj, oldInputParamName) {
if (paramName == null || paramName.length == 0) {
wso2.wsf.Util.alertWarning("Param name is required.");
@@ -361,8 +361,12 @@
}
paramEle.removeAttribute('name');
paramEle.removeAttribute('sqlType');
+ paramEle.removeAttribute('type');
+ paramEle.removeAttribute('ordinal');
paramEle.setAttribute("name", paramName);
paramEle.setAttribute("sqlType", obj[obj.selectedIndex].value);
+ paramEle.setAttribute("type", inOutObj[inOutObj.selectedIndex].value);
+ paramEle.setAttribute("ordinal", ordinalValue);
} else {
// not existing one or change one
if (oldInputParamName == null || oldInputParamName.length == 0) {
@@ -370,6 +374,8 @@
paramEle = rootDocument.createElement("param");
paramEle.setAttribute("name", paramName);
paramEle.setAttribute("sqlType", obj[obj.selectedIndex].value);
+ paramEle.setAttribute("type",
inOutObj[inOutObj.selectedIndex].value);
+ paramEle.setAttribute("ordinal", ordinalValue);
qEle.appendChild(paramEle);
} else {
// exsiting one
@@ -393,6 +399,8 @@
paramEle = rootDocument.createElement("param");
paramEle.setAttribute("name", paramName);
paramEle.setAttribute("sqlType", obj[obj.selectedIndex].value);
+ paramEle.setAttribute("type",
inOutObj[inOutObj.selectedIndex].value);
+ paramEle.setAttribute("ordinal", ordinalValue);
qEle.appendChild(paramEle);
}
@@ -1332,7 +1340,7 @@
}
resultEle.setAttribute("element", elementName);
resultEle.setAttribute("rowName", rowName);
- resultEle.setAttribute("defaultNamespace", rowNamespace);
+ resultEle.setAttribute("defaultNamespace", rowNamespace);
//TODO : fix this
var divInnerHtml = yuiTransformer(dataServiceObj,
"data_service_add_edit_result_mapping.xsl", false, [["queryId",queryId]]);
showYUIPanel("Add New Output Mapping ", divInnerHtml, "600px",
"step2Inner10", "divADDEditOutputMapping");
@@ -2132,11 +2140,12 @@
}
-function editDSInputMapping(queryId, paramName, sqlType) {
- var divInnerHtml = yuiTransformer(dataServiceObj,
"data_service_add_edit_input_mapping.xsl", false,
[["queryId",queryId],["paramName",paramName],["paramSqlType",sqlType],["edit","true"]]);
+function editDSInputMapping(queryId, paramName, sqlType,inOutType,ordinal) {
+ var divInnerHtml = yuiTransformer(dataServiceObj,
"data_service_add_edit_input_mapping.xsl", false,
[["queryId",queryId],["paramName",paramName],["paramSqlType",sqlType],["paramInOutType",inOutType],["paramOrdinal",ordinal],["edit","true"]]);
showYUIPanel("Edit Input Param", divInnerHtml, "600px", "step2Inner4",
"divADDEditInputMapping");
}
+
/*
function remove_ds_ip_mapping(mappingName) {
Modified:
branches/wsas/java/2.2-SNSPSHOT/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_input_mapping.xsl
==============================================================================
---
branches/wsas/java/2.2-SNSPSHOT/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_input_mapping.xsl
(original)
+++
branches/wsas/java/2.2-SNSPSHOT/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_input_mapping.xsl
Tue Jan 15 05:26:15 2008
@@ -3,6 +3,8 @@
<xsl:param name="paramName"/>
<xsl:param name="paramSqlType"/>
<xsl:param name="queryId"/>
+ <xsl:param name="paramInOutType"/>
+ <xsl:param name="paramOrdinal"/>
<xsl:param name="edit"/>
<!--single point of entry or main -->
@@ -16,17 +18,21 @@
<xsl:call-template name="addEditInputMapping">
<xsl:with-param name="name"/>
<xsl:with-param name="sqlType"/>
+ <xsl:with-param name="type"/>
+ <xsl:with-param name="ordinal"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="addEditInputMapping">
<xsl:with-param name="name" select="$paramName"/>
<xsl:with-param name="sqlType" select="$paramSqlType"/>
+ <xsl:with-param name="type" select="$paramInOutType"/>
+ <xsl:with-param name="ordinal" select="$paramOrdinal"/>
</xsl:call-template>
</xsl:otherwise>
</xsl:choose>
<div>
- <input type="button"
onclick="addNewSpecificInputParam('{$queryId}',document.getElementById('inputMappingNameId').value,
document.getElementById('inputMappingSqlTypeId'),'{$paramName}'); return
false;" value="OK"/>
+ <input type="button"
onclick="addNewSpecificInputParam('{$queryId}',document.getElementById('inputMappingNameId').value,
document.getElementById('inputMappingSqlTypeId'),document.getElementById('inputMappingOrdinalId').value,document.getElementById('inputMappingInOutTypeId'),'{$paramName}');
return false;" value="OK"/>
<input type="button"
onclick="closeContainer('divADDEditInputMapping');return false;"
value="Cancel"/>
</div>
</xsl:template>
@@ -34,6 +40,8 @@
<xsl:template name="addEditInputMapping">
<xsl:param name="name"/>
<xsl:param name="sqlType"/>
+ <xsl:param name="type"/>
+ <xsl:param name="ordinal"/>
<div id="formset">
<form name="dataServiceAddQueryForm">
<fieldset style="width: 520px;">
@@ -95,10 +103,60 @@
</xsl:if>
<xsl:attribute
name="value">TIMESTAMP</xsl:attribute>
TIMESTAMP
- </option>
+ </option>
<!--TODO: add any more sqltypes-->
</select>
</div>
+ <div>
+ <label>IN/OUT Type<font
color='blue'>*</font></label>
+ <select>
+ <xsl:attribute
name="id">inputMappingInOutTypeId</xsl:attribute>
+ <option>
+ <xsl:if test="$type=''">
+ <xsl:attribute
name="selected">true</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="value"></xsl:attribute>
+
+ </option>
+ <option>
+ <xsl:if test="$type='IN'">
+ <xsl:attribute
name="selected">true</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="value">IN</xsl:attribute>
+ IN
+ </option>
+ <option>
+ <xsl:if test="$type='OUT'">
+ <xsl:attribute
name="selected">true</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="value">OUT</xsl:attribute>
+ OUT
+ </option>
+ <option>
+ <xsl:if test="$type='INOUT'">
+ <xsl:attribute
name="selected">true</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="value">INOUT</xsl:attribute>
+ INOUT
+ </option>
+ </select>
+ </div>
+ <div>
+ <label>Ordinal<font color='blue'>*</font></label>
+ <input type="text">
+ <xsl:attribute name="size">5</xsl:attribute>
+ <xsl:attribute
name="id">inputMappingOrdinalId</xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="$ordinal"/></xsl:attribute>
+ <xsl:if test="$edit">
+ <!--<xsl:attribute
name="disabled">true</xsl:attribute>-->
+ <xsl:attribute
name="style">background-color:#E4E8F5;</xsl:attribute>
+ </xsl:if>
+ </input>
+ </div>
+ <div>
+ <label><font color='blue'>*Required only for stored
procedures.</font></label>
+ </div>
+
</fieldset>
</form>
</div>
Modified:
branches/wsas/java/2.2-SNSPSHOT/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_operatoin_query.xsl
==============================================================================
---
branches/wsas/java/2.2-SNSPSHOT/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_operatoin_query.xsl
(original)
+++
branches/wsas/java/2.2-SNSPSHOT/wsas/java/modules/www/extensions/core/xslt/data_service_add_edit_operatoin_query.xsl
Tue Jan 15 05:26:15 2008
@@ -42,13 +42,16 @@
</xsl:when>
<xsl:otherwise>
<xsl:for-each select="param">
+ <xsl:variable name="paramType"
select="@type"/>
+ <xsl:if test="$paramType='IN'">
<label>
- <xsl:value-of
select="@name"/>
+ <xsl:value-of
select="@name"/>
</label>
<input type="text">
<xsl:attribute
name="size">30</xsl:attribute>
<xsl:attribute
name="id"><xsl:value-of select="generate-id()"/>_genId</xsl:attribute>
</input>
+ </xsl:if>
</xsl:for-each>
</xsl:otherwise>
</xsl:choose>
Modified:
branches/wsas/java/2.2-SNSPSHOT/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl
==============================================================================
---
branches/wsas/java/2.2-SNSPSHOT/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl
(original)
+++
branches/wsas/java/2.2-SNSPSHOT/wsas/java/modules/www/extensions/core/xslt/data_service_add_query.xsl
Tue Jan 15 05:26:15 2008
@@ -323,7 +323,7 @@
</a>
<a alt="Edit">
<xsl:attribute name="title">Edit</xsl:attribute>
- <xsl:attribute
name="onclick">javascript:editDSInputMapping('<xsl:value-of
select="$queryId"/>', '<xsl:value-of select="@name"/>', '<xsl:value-of
select="@sqlType"/>');return false;</xsl:attribute>
+ <xsl:attribute
name="onclick">javascript:editDSInputMapping('<xsl:value-of
select="$queryId"/>', '<xsl:value-of select="@name"/>', '<xsl:value-of
select="@sqlType"/>','<xsl:value-of select="@type"/>', '<xsl:value-of
select="@ordinal"/>');return false;</xsl:attribute>
<xsl:attribute name="id">edit_link</xsl:attribute>
<xsl:attribute name="href">#</xsl:attribute>
<xsl:text>      </xsl:text>
_______________________________________________
Wsas-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
