[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wsf-c-commits
Subject:    [Wsf-c-commits] svn commit r16401 - in trunk/wsf/php/scripts: .
From:       svn () wso2 ! org
Date:       2008-04-30 16:17:04
Message-ID: E1JrEzQ-0005Dd-Hc () wso2 ! org
[Download RAW message or body]

Author: dimuthu
Date: Wed Apr 30 09:16:58 2008
New Revision: 16401

Log:

adding some warning fixes


Modified:
   trunk/wsf/php/scripts/dynamic_invocation/wsf_wsdl_serialization.php
   trunk/wsf/php/scripts/wsf_wsdl.php

Modified: trunk/wsf/php/scripts/dynamic_invocation/wsf_wsdl_serialization.php
==============================================================================
--- trunk/wsf/php/scripts/dynamic_invocation/wsf_wsdl_serialization.php	(original)
+++ trunk/wsf/php/scripts/dynamic_invocation/wsf_wsdl_serialization.php	Wed Apr 30 \
09:16:58 2008 @@ -778,22 +778,6 @@
                 $user_arguments[$param_name] = $user_obj->$param_name;
             }
 
-            /*
-            if($param_attrs->getNamedItem(WSF_CONTENT_MODEL) &&
-                $param_attrs->getNamedItem(WSF_CONTENT_MODEL)->value == \
                WSF_SIMPLE_CONTENT) {
-                $simple_content_value_const = WSF_SIMPLE_CONTENT_VALUE;
-                $tmp_array = wsf_convert_classobj_to_array($sig_param_node, \
                $user_obj->$simple_content_value_const);
-                $user_arguments[$param_name][$simple_content_value_const] = \
                $tmp_array;
-                $sig_attribute_nodes = $sig_param_node->childNodes;
-                foreach($sig_attribute_nodes as $sig_attribute_node) {
-                    if($sig_attribute_node->attributes->getNamedItem(WSF_ATTRIBUTE) \
                &&
-                        \
                $sig_attribute_node->attributes->getNamedItem(WSF_ATTRIBUTE)->value \
                == "yes") {
-                        $attri_name = \
                $sig_attribute_node->attributes->getNamedItem(WSF_NAME)->value;
-
-                        $user_arguments[$param_name][$attri_name] = \
                $user_obj->$attri_name;
-                    }
-                }
-            } */
         }
         else if($sig_param_node->nodeName == WSF_INNER_CONTENT) {
             $tmp_array = wsf_convert_classobj_to_array($sig_param_node, $user_obj);

Modified: trunk/wsf/php/scripts/wsf_wsdl.php
==============================================================================
--- trunk/wsf/php/scripts/wsf_wsdl.php	(original)
+++ trunk/wsf/php/scripts/wsf_wsdl.php	Wed Apr 30 09:16:58 2008
@@ -252,6 +252,9 @@
     $sig_model_dom->preserveWhiteSpace = false;
     $wsdl_dom->preserveWhiteSpace = false;
     
+    $service_name = NULL;
+    $port_name = NULL;
+
     $wsdl_location = $parameters[WSF_WSDL];
     if(array_key_exists(WSF_SERVICE_NAME, $parameters)) {
         $service_name = $parameters[WSF_SERVICE_NAME];
@@ -303,7 +306,7 @@
     $endpoint_address = wsf_get_endpoint_address($sig_model_dom);
     
     if ($is_wsdl_11 == TRUE && $wsdl_11_dom != NULL) {
-        $binding_node = wsf_get_binding($wsdl_11_dom, $service, $port, TRUE);
+        $binding_node = wsf_get_binding($wsdl_11_dom, $service_name, $port_name, \
TRUE);  if(!$binding_node)
             return  NULL;
         foreach($operation_array as $value) {
@@ -312,7 +315,7 @@
                 
     }
     else{
-        $binding_node = wsf_get_binding($wsdl_dom, $service, $port);
+        $binding_node = wsf_get_binding($wsdl_dom, $service_name, $port_name);
         if(!$binding_node)
             return  NULL;
         foreach($operation_array as $value) {
@@ -343,6 +346,14 @@
     $service_name = NULL;
     $port_name = NULL;
     $is_multiple_interfaces = FALSE;
+    
+    $sig_model_string = NULL;
+    $payload_string = NULL;
+    $operation_name = NULL;
+    $function_name = NULL;
+    $class_name = NULL;
+    $class_map = NULL;
+    $class_args = NULL;
 
     if(array_key_exists(WSF_SERVICE_NAME, $parameters)) {
         $service_name = $parameters[WSF_SERVICE_NAME];
@@ -350,14 +361,28 @@
     if(array_key_exists(WSF_PORT_NAME, $parameters)) {
         $port_name = $parameters[WSF_PORT_NAME];
     }
-   
-    $sig_model_string = $parameters["sig_model_string"];
-    $payload_string = $parameters["payload_string"];
-    $operation_name = $parameters["operation_name"];
-    $function_name = $parameters["function_name"];
-    $class_name = $parameters["class_name"];
-    $class_map = $parameters["classmap"];
-    $class_args = $parameters["class_args"];
+  
+    if(array_key_exists("sig_model_string", $parameters)) {
+        $sig_model_string = $parameters["sig_model_string"];
+    }
+    if(array_key_exists("payload_string", $parameters)) {
+        $payload_string = $parameters["payload_string"];
+    }
+    if(array_key_exists("operation_name", $parameters)) {
+        $operation_name = $parameters["operation_name"];
+    }
+    if(array_key_exists("function_name", $parameters)) {
+        $function_name = $parameters["function_name"];
+    }
+    if(array_key_exists("class_name", $parameters)) {
+        $class_name = $parameters["class_name"];
+    }
+    if(array_key_exists("classmap", $parameters)) {
+        $class_map = $parameters["classmap"];
+    }
+    if(array_key_exists("class_args", $parameters)) {
+        $class_args = $parameters["class_args"];
+    }
 
     
     

_______________________________________________
Wsf-c-commits mailing list
Wsf-c-commits@wso2.org
http://www.wso2.org/cgi-bin/mailman/listinfo/wsf-c-commits


[prev in list] [next in list] [prev in thread] [next in thread]