svn commit: r735415 - in /incubator/shindig/trunk/php/src/social: sample/JsonDbOpensocialService.php service/ActivityHandler.php spi/ActivityService.php

[chabotc]

Author: chabotc
Date: Sun Jan 18 01:53:29 2009
New Revision: 735415

URL: http://svn.apache.org/viewvc?rev=735415&view=rev
Log:
Fix for activities: Properly differentiate between an empty result set when a 
collection is requested, and a not_found error when an specific activity is 
requested by id

Modified:
    incubator/shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php
    incubator/shindig/trunk/php/src/social/service/ActivityHandler.php
    incubator/shindig/trunk/php/src/social/spi/ActivityService.php

Modified: 
incubator/shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php?rev=735415&r1=735414&r2=735415&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php 
(original)
+++ incubator/shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php 
Sun Jan 18 01:53:29 2009
@@ -345,7 +345,7 @@
   }
 
   public function getActivity($userId, $groupId, $appdId, $fields, 
$activityId, SecurityToken $token) {
-    $activities = $this->getActivities($userId, $groupId, $appdId, null, null, 
null, null, $fields, $token);
+    $activities = $this->getActivities($userId, $groupId, $appdId, null, null, 
null, null, $fields, array($activityId), $token);
     if ($activities instanceof RestfulCollection) {
       $activities = $activities->getEntry();
       foreach ($activities as $activity) {
@@ -357,7 +357,7 @@
     throw new SocialSpiException("Activity not found", 
ResponseError::$NOT_FOUND);
   }
 
-  public function getActivities($userIds, $groupId, $appId, $sortBy, 
$filterBy, $filterOp, $filterValue, $startIndex, $count, $fields, $token) {
+  public function getActivities($userIds, $groupId, $appId, $sortBy, 
$filterBy, $filterOp, $filterValue, $startIndex, $count, $fields, $activityIds, 
$token) {
     $db = $this->getDb();
     $friendsTable = $db[self::$FRIEND_LINK_TABLE];
     $ids = array();

Modified: incubator/shindig/trunk/php/src/social/service/ActivityHandler.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social/service/ActivityHandler.php?rev=735415&r1=735414&r2=735415&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/service/ActivityHandler.php 
(original)
+++ incubator/shindig/trunk/php/src/social/service/ActivityHandler.php Sun Jan 
18 01:53:29 2009
@@ -21,7 +21,7 @@
 class ActivityHandler extends DataRequestHandler {
   private $service;
   
-  private static $ACTIVITY_ID_PATH = 
"/activities/{userId}/{groupId}/appId/{activityId}";
+  private static $ACTIVITY_ID_PATH = 
"/activities/{userId}/{groupId}/{activityId}";
 
   public function __construct() {
     $service = Config::get('activity_service');
@@ -65,7 +65,7 @@
         return $this->service->getActivities($userIds[0], 
$requestItem->getGroup(), $requestItem->getAppId(), $requestItem->getSortBy(), 
$requestItem->getFilterBy(), $requestItem->getFilterOperation(), 
$requestItem->getFilterValue(), $requestItem->getStartIndex(), 
$requestItem->getCount(), $requestItem->getFields(), $optionalActivityIds, 
$requestItem->getToken());
       }
     }
-    return $this->service->getActivities($userIds, $requestItem->getGroup(), 
$requestItem->getAppId(), $requestItem->getSortBy(), 
$requestItem->getFilterBy(), $requestItem->getFilterOperation(), 
$requestItem->getFilterValue(), $requestItem->getStartIndex(), 
$requestItem->getCount(), $requestItem->getFields(), $requestItem->getToken());
+    return $this->service->getActivities($userIds, $requestItem->getGroup(), 
$requestItem->getAppId(), $requestItem->getSortBy(), 
$requestItem->getFilterBy(), $requestItem->getFilterOperation(), 
$requestItem->getFilterValue(), $requestItem->getStartIndex(), 
$requestItem->getCount(), $requestItem->getFields(), null, 
$requestItem->getToken());
   }
 
   /**

Modified: incubator/shindig/trunk/php/src/social/spi/ActivityService.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social/spi/ActivityService.php?rev=735415&r1=735414&r2=735415&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/spi/ActivityService.php (original)
+++ incubator/shindig/trunk/php/src/social/spi/ActivityService.php Sun Jan 18 
01:53:29 2009
@@ -23,7 +23,7 @@
   /**
    * Returns a list of activities that correspond to the passed in person ids.
    */
-  public function getActivities($userIds, $groupId, $appId, $sortBy, 
$filterBy, $filterOp, $filterValue, $startIndex, $count, $fields, $token);
+  public function getActivities($userIds, $groupId, $appId, $sortBy, 
$filterBy, $filterOp, $filterValue, $startIndex, $count, $fields, $activityIds, 
$token);
 
   public function getActivity($userId, $groupId, $appdId, $fields, 
$activityId, SecurityToken $token);