[Gforge-commits] gforge/www/soap/common group.php, 1.2, 1.3 user.php, 1.3, 1.4

[lo-lan-do]

Update of /cvsroot/gforge/gforge/www/soap/common
In directory db.perdue.net:/tmp/cvs-serv5072/common

Modified Files:
        group.php user.php 
Log Message:
Hal's patch #1015

Index: group.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/soap/common/group.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- group.php   20 Sep 2004 20:17:23 -0000      1.2
+++ group.php   15 Dec 2004 17:48:43 -0000      1.3
@@ -26,24 +26,25 @@
 
 require_once('common/include/Error.class');
 require_once('common/include/Group.class');
+require_once('common/include/GForge.class');
 
 // Add The definition of a group object
 $server->wsdl->addComplexType(
        'Group',
        'complexType',
        'struct',
-       'sequence',
+       'all',
        '',
        array(
-       'group_id' => array('name'=>'group_id', 'type' => 'xsd:integer'),
+       'group_id' => array('name'=>'group_id', 'type' => 'xsd:int'),
        'group_name' => array('name'=>'group_name', 'type' => 'xsd:string'),
        'homepage' => array('name'=>'homepage', 'type' => 'xsd:string'),
-       'is_public' => array('name'=>'is_public', 'type' => 'xsd:integer'),
+       'is_public' => array('name'=>'is_public', 'type' => 'xsd:int'),
        'status' => array('name'=>'status', 'type' => 'xsd:string'),
        'unix_group_name' => array('name'=>'unix_group_name', 'type' => 
'xsd:string'),
        'short_description' => array('name'=>'short_description', 'type' => 
'xsd:string'),
        'scm_box' => array('name'=>'scm_box', 'type' => 'xsd:string'),
-       'register_time' => array('name'=>'register_time', 'type' => 
'xsd:integer') ) );
+       'register_time' => array('name'=>'register_time', 'type' => 'xsd:int') 
) );
 
 // Array of groups
 $server->wsdl->addComplexType(
@@ -59,38 +60,70 @@
 //getGroups (id array)
 $server->register(
     'getGroups',
-    array('session_ser'=>'string','group_ids'=>'xsd:integer[]'),
-    array('groupResponse'=>'tns:ArrayOfGroup'),
-    $uri);
+    array('session_ser'=>'xsd:string','group_ids'=>'tns:ArrayOfint'),
+    array('return'=>'tns:ArrayOfGroup'),
+    $uri,
+    $uri.'#getGroups','rpc','encoded'
+);
 
 //getGroupsByName (unix_name array)
 $server->register(
     'getGroupsByName',
-    array('session_ser'=>'string','group_ids'=>'xsd:string[]'),
-    array('groupResponse'=>'tns:ArrayOfGroup'),
-    $uri);
+    array('session_ser'=>'xsd:string','group_names'=>'tns:ArrayOfstring'),
+    array('return'=>'tns:ArrayOfGroup'),
+    $uri,
+    $uri.'#getGroupsByName','rpc','encoded'
+);
 
+//getPublicProjectNames ()
+$server->register(
+    'getPublicProjectNames',
+    array('session_ser'=>'xsd:string'),
+    array('return'=>'tns:ArrayOfstring'),
+    $uri,
+    $uri.'#getPublicProjectNames','rpc','encoded'
+);
 
 function &getGroups($session_ser,$group_ids) {
+       global $feedback;
        continue_session($session_ser);
+
+       $inputArgs = $session_ser;
+       for ($i=0; $i<count($group_ids); $i++) {
+               $inputArgs = $inputArgs.':'.$group_ids[i];
+       }
+
        $grps =& group_get_objects($group_ids);
        if (!$grps) {
-               return new soap_fault ('','','','Could Not Get Groups');
+               return new soap_fault ('2001','group','Could Not Get Groups by 
Id'.$inputArgs,$feedback);
        }
 
        return groups_to_soap($grps);
 }
 
 function &getGroupsByName($session_ser,$group_names) {
-       continue_session($session_ser);
+       session_continue($session_ser);
        $grps =& group_get_objects_by_name($group_names);
        if (!$grps) {
-               return new soap_fault ('','','','Could Not Get Groups');
+               return new soap_fault ('2002','group','Could Not Get Groups by 
Name','Could Not Get Groups by Name');
        }
 
        return groups_to_soap($grps);
 }
 
+
+// use as a way to get group names for use in getGroupsByName
+function &getPublicProjectNames($session_ser) {
+       continue_session($session_ser);
+       $gforge = new GForge();
+       $result = $gforge->getPublicProjectNames();
+       if ($gforge->isError()) {
+               $errMsg = 'Could Not Get Public Group Names: 
'.$gforge->getErrorMessage();
+               return new soap_fault ('2003','group',$errMsg,$errMsg);
+       }
+       return $result;
+}
+
 /*
        Converts an array of Group objects to soap data
 */
@@ -110,9 +143,10 @@
                        'scm_box'=>$grps[$i]->data_array['scm_box'],
                        
'register_time'=>$grps[$i]->data_array['register_time']);
                }
-
        }
-       return new soapval('tns:ArrayOfGroup', 'ArrayOfGroup', $return);
+       // changed to not return soapval which is not necessary
+       // since we have wsdl to describe return value
+       return $return;
 }
 
 

Index: user.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/soap/common/user.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- user.php    21 Sep 2004 14:17:25 -0000      1.3
+++ user.php    15 Dec 2004 17:48:43 -0000      1.4
@@ -35,7 +35,7 @@
        'sequence',
        '',
        array(
-       'user_id' => array('name'=>'user_id', 'type' => 'xsd:integer'),
+       'user_id' => array('name'=>'user_id', 'type' => 'xsd:int'),
        'user_name' => array('name'=>'user_name', 'type' => 'xsd:string'),
        'title' => array('name'=>'title', 'type' => 'xsd:string'),
        'firstname' => array('name'=>'firstname', 'type' => 'xsd:string'),
@@ -47,8 +47,8 @@
        'status' => array('name'=>'status', 'type' => 'xsd:string'),
        'timezone' => array('name'=>'timezone', 'type' => 'xsd:string'),
        'country_code' => array('name'=>'country_code', 'type' => 'xsd:string'),
-       'add_date' => array('name'=>'add_date', 'type' => 'xsd:integer'), 
-       'language_id' => array('name'=>'language_id', 'type' => 'xsd:integer') 
+       'add_date' => array('name'=>'add_date', 'type' => 'xsd:int'), 
+       'language_id' => array('name'=>'language_id', 'type' => 'xsd:int') 
        ) );
 
 // Array of users
@@ -65,23 +65,29 @@
 //getUsers (id array)
 $server->register(
     'getUsers',
-    array('session_ser'=>'string','user_ids'=>'xsd:integer[]'),
+    array('session_ser'=>'string','user_ids'=>'tns:ArrayOfint'),
     array('userResponse'=>'tns:ArrayOfUser'),
-    $uri);
+    $uri,
+    $uri.'#getUsers','rpc','encoded'
+);
 
 //getUsersByName (unix_name array)
 $server->register(
     'getUsersByName',
-    array('session_ser'=>'string','user_ids'=>'xsd:string[]'),
+    array('session_ser'=>'string','user_ids'=>'tns:ArrayOfstring'),
     array('userResponse'=>'tns:ArrayOfUser'),
-    $uri);
+    $uri,
+    $uri.'#getUsersByName','rpc','encoded'
+);
 
 //getGroups (id array)
 $server->register(
     'userGetGroups',
-    array('session_ser'=>'string','user_id'=>'xsd:integer'),
+    array('session_ser'=>'string','user_id'=>'xsd:int'),
     array('groupResponse'=>'tns:ArrayOfGroup'),
-    $uri);
+    $uri,
+    $uri.'#userGetGroups','rpc','encoded'
+);
 
 
 //get user objects for array of user_ids
@@ -89,7 +95,7 @@
        continue_session($session_ser);
        $usrs =& user_get_objects($user_ids);
        if (!$usrs) {
-               return new soap_fault ('','','','Could Not Get Users');
+               return new soap_fault ('3001','user','Could Not Get Users By 
Id','Could Not Get Users By Id');
        }
 
        return users_to_soap($usrs);
@@ -100,7 +106,7 @@
        continue_session($session_ser);
        $usrs =& user_get_objects_by_name($user_names);
        if (!$usrs) {
-               return new soap_fault ('','','','Could Not Get Users');
+               return new soap_fault ('3002','user','Could Not Get Users By 
Name','Could Not Get Users By Name');
        }
 
        return users_to_soap($usrs);
@@ -110,9 +116,9 @@
 function &userGetGroups($session_ser,$user_id) {
        continue_session($session_ser);
        $user =& user_get_object($user_id);
-    if (!$user) {
-        return new soap_fault ('','','','Could Not Get User');
-    }
+       if (!$user) {
+               return new soap_fault ('3003','user','Could Not Get Users 
Groups','Could Not Get Users Groups');
+       }
        return groups_to_soap($user->getGroups());
 }
 
@@ -144,7 +150,7 @@
                }
 
        }
-       return new soapval('tns:ArrayOfUser', 'ArrayOfUser', $return);
+       return $return;
 }