Changeset 28823 in vbox

Timestamp:

Apr 27, 2010 1:46:35 PM (15 years ago)

Author:

vboxsync

Message:

Webservice: PHP updates by James Lucas

Location:

trunk/src/VBox/Main/webservice

Files:

• types.txt (modified) (2 diffs)
• websrv-php.xsl (modified) (7 diffs)

trunk/src/VBox/Main/webservice/types.txt

@@ -1 +1 @@
 
- XIDL               IPRT        COM         XPCOM           WSDL                gSOAP default          JAX-WS
+ XIDL               IPRT        COM         XPCOM           WSDL                gSOAP default          JAX-WS            PHP
 
- boolean                        BOOL        PRBool          xsd:boolean         bool                   Boolean
+ boolean                        BOOL        PRBool          xsd:boolean         bool                   Boolean           boolean
 
- octet              uint8_t     BYTE        PRUint8         xsd:unsignedByte                           Short
+ octet              uint8_t     BYTE        PRUint8         xsd:unsignedByte                           Short             integer
 
- short              int16_t     SHORT       PRInt16         xsd:short           short                  Short   (2)
- unsigned short     uint16_t    USHORT      PRUint16        xsd:unsignedShort   unsigned short         Integer (2)
- long               int32_t     LONG        PRInt32         xsd:int             int                    Integer (2)
- unsigned long      uint32_t    ULONG       PRUint32        xsd:unsignedInt     unsigned int           Long    (2)
- long long          int64_t     LONG64      PRInt64         xsd:long            long long              Long    (2)
- unsigned long long uint64_t    ULONG64     PRUint64        xsd:unsignedLong    unsigned long long     BigInteger (2)
+ short              int16_t     SHORT       PRInt16         xsd:short           short                  Short   (2)       integer
+ unsigned short     uint16_t    USHORT      PRUint16        xsd:unsignedShort   unsigned short         Integer (2)       integer
+ long               int32_t     LONG        PRInt32         xsd:int             int                    Integer (2)       integer
+ unsigned long      uint32_t    ULONG       PRUint32        xsd:unsignedInt     unsigned int           Long    (2)       float (3)
+ long long          int64_t     LONG64      PRInt64         xsd:long            long long              Long    (2)       float (3)
+ unsigned long long uint64_t    ULONG64     PRUint64        xsd:unsignedLong    unsigned long long     BigInteger (2)    float (3)
 
- double                                                     xsd:double          double                 Double
- float                                                      xsd:float           float                  Float
+ double                                                     xsd:double          double                 Double            float
+ float                                                      xsd:float           float                  Float             float
 
- wstring                        BSTR        PRUnichar*      xsd:string          std::string            String
+ wstring                        BSTR        PRUnichar*      xsd:string          std::string            String            string
 
- result                                                     xsd:unsignedInt(1)  (undefined)
+ result                                                     xsd:unsignedInt(1)  (undefined)                             
 
  uuid                                                       xsd:string(1)       (undefined)
@@ -26 +26 @@
 (2) Java "Short" is signed 16-bit integer; since Java has no support for unsigned types, we need to use the
     next bigger class, which is Integer, for IPRT uint16_t. Similarly for the other integer types.
+(3) PHP does not support unsigned integers; Size of integer is platform-dependant, usual value of at least 32-bits signed. Use float for numbers greeted that signed 32-bit int
 
 

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

@@ -10 +10 @@
         web service API. Depends on WSDL file for actual SOAP bindings.
 
-    Contributed by James Lucas (mjlucas at eng.uts.edu.au).
-
-     Copyright (C) 2009 Oracle Corporation
+     Contributed by James Lucas (mjlucas at eng.uts.edu.au).
+
+     Copyright (C) 2006-2010 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as
@@ -55 +55 @@
       </xsl:call-template>
     </xsl:when>
-    <xsl:when test="$type='long' or $type='unsigned long' or $type='long long' or $type='short' or $type='unsigned short' or $type='unsigned long long' or $type='result'">
+    <xsl:when test="$type='short' or $type='unsigned short' or $type='long' or $type='octet'">
       <xsl:call-template name="emitPrimitive">
         <xsl:with-param name="type">int</xsl:with-param>
@@ -62 +62 @@
       </xsl:call-template>
     </xsl:when>
-    <xsl:when test="$type='double' or $type='float'">
+    <xsl:when test="$type='double' or $type='float' or $type='unsigned long' or $type='long long' or $type='unsigned long long'">
       <xsl:call-template name="emitPrimitive">
         <xsl:with-param name="type">float</xsl:with-param>
-        <xsl:with-param name="value" select="$value" />
-        <xsl:with-param name="safearray" select="$safearray"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$type='octet'">
-      <xsl:call-template name="emitPrimitive">
-        <xsl:with-param name="type">octet</xsl:with-param>
         <xsl:with-param name="value" select="$value" />
         <xsl:with-param name="safearray" select="$safearray"/>
@@ -81 +74 @@
         <xsl:with-param name="value" select="$value" />
         <xsl:with-param name="safearray" select="$safearray"/>
-      </xsl:call-template> 
+      </xsl:call-template>
    </xsl:when>
     <xsl:otherwise>
@@ -88 +81 @@
         <xsl:with-param name="value" select="$value" />
         <xsl:with-param name="safearray" select="$safearray"/>
-      </xsl:call-template> 
+      </xsl:call-template>
     </xsl:otherwise>
   </xsl:choose>
@@ -452 +445 @@
     }
 
-    /** ArrayAccess Functions **/ 
+    /** ArrayAccess Functions **/
     public function offsetSet($offset, $value) {
         if ($value instanceof $this->_interfaceName)
@@ -464 +457 @@
                 $this->_objects[] = $value;
             }
-        } 
+        }
         else
         {