Changeset 59486 in vbox

Timestamp:

Jan 26, 2016 7:38:44 PM (9 years ago)

Author:

vboxsync

Message:

websrv-python.xsl: fixed safearray handling of attribute setters

File:

• trunk/src/VBox/Main/webservice/websrv-python.xsl (modified) (8 diffs)

trunk/src/VBox/Main/webservice/websrv-python.xsl

@@ -10 +10 @@
         web service API. Depends on WSDL file for actual SOAP bindings.
 
-    Copyright (C) 2008-2015 Oracle Corporation
+    Copyright (C) 2008-2016 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
@@ -95 +95 @@
        req._this=self.handle
        val=self.mgr.getPort().<xsl:value-of select="$ifname"/>_<xsl:value-of select="$fname"/>(req)
-       <xsl:text>return  </xsl:text>
+       <xsl:text>return </xsl:text>
        <xsl:call-template name="emitOutParam">
            <xsl:with-param name="ifname" select="$ifname" />
@@ -101 +101 @@
            <xsl:with-param name="type" select="$attrtype" />
            <xsl:with-param name="value" select="concat('val.','_returnval')" />
-           <xsl:with-param name="safearray" select="@safearray"/>
+           <xsl:with-param name="safearray" select="$attrsafearray"/>
          </xsl:call-template>
 </xsl:template>
@@ -114 +114 @@
        req=<xsl:value-of select="$ifname"/>_<xsl:value-of select="$fname"/>RequestMsg()
        req._this=self.handle
-       if type(value) in [int, bool, basestring, str]:
-            req._<xsl:value-of select="$attrname"/> = value
+       <xsl:choose>
+         <xsl:when test="$attrsafearray='yes'">
+          <xsl:text>req._</xsl:text><xsl:value-of select="$attrname"/><xsl:text> = value</xsl:text>
+         </xsl:when>
+         <xsl:otherwise>
+           <xsl:text>if type(value) in [int, bool, basestring, str]:
+            req._</xsl:text><xsl:value-of select="$attrname"/><xsl:text> = value
        else:
-            req._<xsl:value-of select="$attrname"/> = value.handle
+            req._</xsl:text><xsl:value-of select="$attrname"/><xsl:text> = value.handle</xsl:text>
+         </xsl:otherwise>
+       </xsl:choose>
        self.mgr.getPort().<xsl:value-of select="$ifname"/>_<xsl:value-of select="$fname"/>(req)
 </xsl:template>
@@ -241 +248 @@
       <xsl:variable name="attrtype"><xsl:value-of select="@type" /></xsl:variable>
       <xsl:variable name="attrreadonly"><xsl:value-of select="@readonly" /></xsl:variable>
+      <xsl:variable name="attrsafearray"><xsl:value-of select="@safearray" /></xsl:variable>
       <!-- skip this attribute if it has parameters of a type that has wsmap="suppress" -->
       <xsl:choose>
@@ -260 +268 @@
             <xsl:with-param name="attrname" select="$attrname" />
             <xsl:with-param name="attrtype" select="$attrtype" />
+            <xsl:with-param name="attrsafearray" select="$attrsafearray" />
           </xsl:call-template>
           <!-- bb) emit a set method if the attribute is read/write -->
@@ -267 +276 @@
               <xsl:with-param name="attrname" select="$attrname" />
               <xsl:with-param name="attrtype" select="$attrtype" />
+              <xsl:with-param name="attrsafearray" select="$attrsafearray" />
             </xsl:call-template>
           </xsl:if>
@@ -468 +478 @@
 
 <xsl:template match="/">
-<xsl:text># Copyright (C) 2008-2015 Oracle Corporation
+<xsl:text># Copyright (C) 2008-2016 Oracle Corporation
 #
 # This file is part of a free software library; you can redistribute