Source cleanup

diff --git a/ext/soap/interop/client_round2_interop.php b/ext/soap/interop/client_round2_interop.php
index 7d981b33d242c00eafc728a0edfee53cd2d95f15..0f70b8a2ac47fba3aafe6f76a0bbb2259ad78c66 100644 (file)
--- a/ext/soap/interop/client_round2_interop.php
+++ b/ext/soap/interop/client_round2_interop.php
@@ -91,9 +91,10 @@ class Interop_Client
 
         // retreive endpoints from the endpoint server
         $endpointArray = $soapclient->__call("GetEndpointInfo",array("groupName"=>$test),"http://soapinterop.org/info/","http://soapinterop.org/info/");
-        if (PEAR::isError($endpointArray)) {
-            print $soapclient->wire;
+        if ($soapclient->__isfault() || PEAR::isError($endpointArray)) {
+            print "<pre>".$soapclient->wire."\n";
             print_r($endpointArray);
+            print "</pre>";
             return;
         }
 
@@ -185,6 +186,8 @@ class Interop_Client
             if (!$all) $sql .= "and status=1";
         } else
         if (!$all) $sql .= "where status=1";
+        $sql .= " order by endpointName";
+        
 
         $db_ep = $this->dbc->getAll($sql,NULL, DB_FETCHMODE_ASSOC );
         if (DB::isError($db_ep)) {

diff --git a/ext/soap/interop/server_round2_base.php b/ext/soap/interop/server_round2_base.php
index 0c6771d88eedd1f5606438dffcf1c99ebde7d9a6..ea76bddc40f6b22636f4f0119dda6911c7f38685 100644 (file)
--- a/ext/soap/interop/server_round2_base.php
+++ b/ext/soap/interop/server_round2_base.php
@@ -20,46 +20,7 @@
 // $Id$
 //
 
-function generateFault($short, $long)
-{
-    $params = array(
-        "faultcode" => "Server",
-        "faultstring" => $short,
-        "detail" => $long
-    );
-
-    $faultmsg  = new SOAP_Message("Fault",$params,"http://schemas.xmlsoap.org/soap/envelope/");
-    return $faultmsg;
-}
-
-function hex2bin($data)
-{
-    $len = strlen($data);
-    return pack("H" . $len, $data);
-}
-
-
 class SOAP_Interop_Base {
-    var $method_namespace = 'http://soapinterop.org/';
-
-    function SOAP_Interop_Base() {
-       #if ($server) {
-       #    $server->addToMap("echoString",array("string"),array("string"));
-       #    $server->addToMap("echoStringArray",array(),array());
-       #    $server->addToMap("echoInteger",array("int"),array("int"));
-       #    $server->addToMap("echoIntegerArray",array(),array());
-       #    $server->addToMap("echoFloat",array("float"),array("float"));
-       #    $server->addToMap("echoFloatArray",array(),array());
-       #    $server->addToMap("echoStruct",array(),array());
-       #    $server->addToMap("echoStructArray",array(),array());
-       #    $server->addToMap("echoVoid",array(),array());
-       #    $server->addToMap("echoBase64",array("base64Binary"),array("base64Binary"));
-       #    $server->addToMap("echoDate",array("dateTime"),array("dateTime"));
-       #    $server->addToMap("echoHexBinary",array("hexBinary"),array("hexBinary"));
-       #    $server->addToMap("echoDecimal",array("decimal"),array("decimal"));
-       #    $server->addToMap("echoBoolean",array("boolean"),array("boolean"));
-       #}
-    }
 
     function echoString($inputString)
     {

diff --git a/ext/soap/interop/server_round2_groupB.php b/ext/soap/interop/server_round2_groupB.php
index eaae5ba89b9da051d8dea1e259b1b5576ac8ecf3..921f31d934dc4cdc9fd720f28c3b9d77f9279485 100644 (file)
--- a/ext/soap/interop/server_round2_groupB.php
+++ b/ext/soap/interop/server_round2_groupB.php
@@ -21,16 +21,6 @@
 //
 
 class SOAP_Interop_GroupB {
-    var $method_namespace = 'http://soapinterop.org/';
-    var $dispatch_map = array();
-
-    function SOAP_Interop_GroupB() {
-      $this->dispatch_map['echoStructAsSimpleTypes'] =
-        array('in' => array('inputStruct' => 'SOAPStruct'),
-              'out' => array('outputString' => 'string', 'outputInteger' => 'int', 'outputFloat' => 'float')
-             );
-
-    }
 
     function echoStructAsSimpleTypes ($struct)
     {
@@ -53,7 +43,6 @@ class SOAP_Interop_GroupB {
 
     function echo2DStringArray($ary)
     {
-//      $ret->options['flatten'] = TRUE;
       return $ary;
     }