From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Tue, 21 Apr 2009 11:54:43 +0000 (+0000)
Subject: - handling optional arguments
X-Git-Tag: glite-lbjp-common-db_R_1_0_0_7~11
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=e51d604a8f1e834049453d858541fd5eab8344ba;p=jra1mw.git

- handling optional arguments
- added NotifNew
---

diff --git a/org.glite.lb.ws-interface/src/LB.xml b/org.glite.lb.ws-interface/src/LB.xml
index a59cb7f..377f7e3 100644
--- a/org.glite.lb.ws-interface/src/LB.xml
+++ b/org.glite.lb.ws-interface/src/LB.xml
@@ -81,6 +81,17 @@
 			<fault name="genericFault" type="genericFault"> Any error. </fault>
 		</op>
 
+		<op name="NotifNew">
+			<input name="notifId" type="xsd:string"/>
+			<input name="conditions" type="queryConditions" list="yes"/>
+			<input name="flags" type="jobFlags" optional="yes"/>
+			<input name="addressOverride" type="xsd:string" optional="yes"/>
+			<input name="valid" type="xsd:dateTime" optional="yes"/>
+			<output name="valid" type="xsd:dateTime"/>
+			<fault name="genericFault" type="genericFault"/>
+		</op>
+
+
 		<!-- TODO: event queries -->
 
 	</operations>
diff --git a/org.glite.lb.ws-interface/src/puke-wsdl.xsl b/org.glite.lb.ws-interface/src/puke-wsdl.xsl
index edaf944..a36aa49 100644
--- a/org.glite.lb.ws-interface/src/puke-wsdl.xsl
+++ b/org.glite.lb.ws-interface/src/puke-wsdl.xsl
@@ -179,7 +179,13 @@
 							<xsl:otherwise>1</xsl:otherwise>
 						</xsl:choose>
 					</xsl:variable>
-					<xsd:element name="{@name}" type="{$prefix}{@type}" minOccurs="1" maxOccurs="{$max}"/>
+					<xsl:variable name="min">
+						<xsl:choose>
+							<xsl:when test="@optional='yes'">0</xsl:when>
+							<xsl:otherwise>1</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					<xsd:element name="{@name}" type="{$prefix}{@type}" minOccurs="{$min}" maxOccurs="{$max}"/>
 				</xsl:for-each>
 			</xsd:sequence>
 		</xsd:complexType>