Changeset 49

Timestamp:

08/16/08 07:35:31 (4 years ago)

Author:

mtutty

Message:

FIXED: #674: Error on doc/lit wrapped messages with no elements
Built version 0.6.7

Files:

• trunk/build.xml (modified) (2 diffs)
• trunk/src/bin/parser/DOMParser.php (modified) (4 diffs)
• trunk/src/bin/types/Function.php (modified) (1 diff)

trunk/build.xml

@@ -29 +29 @@
-<project name="SOAP_Toolkit" basedir="." default="main">
-
-6
+7
-        <property name="src.base.dir" value="src" />
-        <property name="build.base.dir" value="build" />
@@ -148 +148 @@
-
-                        <option name="notes">
-3: Add LGPL code base - Added LGPL comment header to all source files, added COPYING and COPYING.LESSER to ditribution package
+4: Error on doc/lit wrapped messages with no elements
-                        </option>
-

trunk/src/bin/parser/DOMParser.php

@@ -267 +267 @@
-        
-        public function & GetMessageParameters($messageName, $isDoc = FALSE, $isLit = FALSE) {
+                $this->wl('GetMessageParameters:Enter', TRUE);
-                $query          = "//*[local-name()='message'][@name='$messageName']/*[local-name()='part']";
-                $partNodes              = $this->xpath->query($query);
+                $this->wl("$messageName: found " . count($partNodes) . ' potential part nodes for this message', TRUE);
+                
-                $nameAttribute  = 'element'; // for document style
-                
@@ -303 +306 @@
-                        $elemName       = self::LocalName($partNode->getAttribute($nameAttribute));
-                        $this->wl("$messageName: using fields from element $elemName for parameters of message {$partNode->getAttribute('name')}");
-
-
+
+
+
+
+
+
+
+
+
+
-                        $this->wl("$messageName: found {$elemNodes->length} elements for type $elemName");
-                        foreach ($elemNodes as $elemNode) {
@@ -352 +363 @@
-                $messageTypes   = $this->GetMessageParameters($messageName, $isDoc, $isLit);
-
-
-
-
+//
+//
+//
-
-                if (count($messageTypes) > 1) {
-                        throw new Exception("More than one part node found for message type $messageName");
-                }
-
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-        
@@ -470 +484 @@
-        
-        public function & ParseServiceFunction(DOMNode $node, $isDoc = FALSE, $isLit = FALSE) {
-
-
-
+       
+       
+       
-                $responseMessageName    = $this->GetOutputMessageName($node);
-
-
-
+       
+
+       
-
-                $function->setName($name);              
-
+
+
+
-                $function->setOriginalName($name);
-                $function->setDocumentation($this->GetDocumentationForNode($node));

trunk/src/bin/types/Function.php

@@ -28 +28 @@
-        private $originalName;
-        private $name;
-
-
+ = 'void'
+ = array()
-
-        private static $primitive_types = array('string', 'int', 'long', 'float', 'boolean', 'dateTime', 'double', 'short', 'UNKNOWN', 'base64Binary', 'decimal', 'hexBinary'); // TODO: dateTime is special, maybe use PEAR::Date or similar