Changeset 2478 for trunk/include/ws_core.inc.php

Timestamp:

Aug 20, 2008, 1:58:35 AM (16 years ago)

Author:

rvelices

Message:

• ws can include php file before invoking web call method
• remove "Pierrick ..." from some languages
• tags - small change to avoid increasing number of urls
• added a missing closedir
• remove some unnecessary class names and inexisting rel attributes

File:

• trunk/include/ws_core.inc.php (modified) (8 diffs)

trunk/include/ws_core.inc.php

@@ -345 +345 @@
   var $_responseFormat;
 
-  var $_methods;
-  var $_methodSignatures;
+  var $_methods = array();
 
   function PwgServer()
   {
-    $methods = array();
   }
 
@@ -436 +434 @@
   function addMethod($methodName, $callback, $params=array(), $description, $include_file='')
   {
-    $this->_methods[$methodName] = $callback;
-    $this->_methodDescriptions[$methodName] = $description;
-
     if (!is_array($params))
     {
@@ -470 +465 @@
       }
     }
-    $this->_methodSignatures[$methodName] = $params;
+
+    $this->_methods[$methodName] = array(
+      'callback'    => $callback,
+      'description' => $description,
+      'signature'   => $params,
+      'include'     => $include_file,
+      );
   }
 
@@ -480 +481 @@
   function getMethodDescription($methodName)
   {
-    $desc = @$this->_methodDescriptions[$methodName];
+    $desc = @$this->_methods[$methodName]['description'];
     return isset($desc) ? $desc : '';
   }
@@ -486 +487 @@
   function getMethodSignature($methodName)
   {
-    $signature = @$this->_methodSignatures[$methodName];
+    $signature = @$this->_methods[$methodName]['signature'];
     return isset($signature) ? $signature : array();
   }
@@ -518 +519 @@
   function invoke($methodName, $params)
   {
-    $callback = @$this->_methods[$methodName];
-
-    if ( $callback==null )
+    $method = @$this->_methods[$methodName];
+
+    if ( $method==null )
     {
       return new PwgError(WS_ERR_INVALID_METHOD, 'Method name "'.$methodName.'" is not valid');
@@ -526 +527 @@
 
     // parameter check and data coercion !
-    $signature = @$this->_methodSignatures[$methodName];
+    $signature = $method['signature'];
     $missing_params = array();
     foreach($signature as $name=>$options)
@@ -571 +572 @@
     if ( strtolower( get_class($result) )!='pwgerror')
     {
-      $result = call_user_func_array($callback, array($params, &$this) );
+      if ( !empty($method['include']) )
+      {
+        include_once( $method['include'] );
+      }
+      $result = call_user_func_array($method['callback'], array($params, &$this) );
     }
     return $result;