Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit 40546e1

Browse files
author
Julien Jomier
committed
ENH: Fixing new API
1 parent 99da30d commit 40546e1

10 files changed

+79
-10
lines changed

core/models/cassandra/CommunityModel.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?php
2+
require_once BASE_PATH.'/core/models/base/CommunityModelBase.php';
3+
24
/**
35
* \class FeedModel
46
* \brief Cassandra Model
57
*/
6-
class CommunityModel extends MIDASCommunityModel
8+
class CommunityModel extends CommunityModelBase
79
{
810
function getPublicCommunities($limit=20)
911
{

core/models/cassandra/FeedModel.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?php
2+
require_once BASE_PATH.'/core/models/base/FeedModelBase.php';
3+
24
/**
35
* \class FeedModel
46
* \brief Cassandra Model
57
*/
6-
class FeedModel extends MIDASFeedModel
8+
class FeedModel extends FeedModelBase
79
{
810
protected function _getFeeds($loggedUserDao,$userDao=null,$communityDao=null,$policy=0,$limit=20)
911
{

core/models/cassandra/FeedpolicygroupModel.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?php
2+
require_once BASE_PATH.'/core/models/base/FeedpolicygroupModelBase.php';
3+
24
/**
35
* \class Feedpolicygroup
46
* \brief Cassandra Model
57
*/
6-
class FeedpolicygroupModel extends MIDASFeedpolicygroupModel
8+
class FeedpolicygroupModel extends FeedpolicygroupModelBase
79
{
810

911

core/models/cassandra/FeedpolicyuserModel.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?php
2+
require_once BASE_PATH.'/core/models/base/FeedpolicyuserModelBase.php';
3+
24
/**
35
* \class Feedpolicyuser
46
* \brief Cassandra Model
57
*/
6-
class FeedpolicyuserModel extends MIDASFeedpolicyuserModel
8+
class FeedpolicyuserModel extends FeedpolicyuserModelBase
79
{
810

911

core/models/cassandra/FolderModel.php

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,37 @@
11
<?php
2+
require_once BASE_PATH.'/core/models/base/FolderModelBase.php';
3+
24
/**
35
* \class FolderModel
46
* \brief Cassandra Model
57
*/
6-
class FolderModel extends MIDASFolderModel
8+
class FolderModel extends FolderModelBase
79
{
10+
11+
/** Get a user by email */
12+
function getByFolder_id($folderid)
13+
{
14+
try
15+
{
16+
$folder = new ColumnFamily($this->database->getDB(), 'folder');
17+
$folderarray = $folder->get($folderid);
18+
// Add the user_id
19+
$folderarray[$this->_key] = $folderid;
20+
$dao= $this->initDao('Folder',$userarray);
21+
}
22+
catch(cassandra_NotFoundException $e)
23+
{
24+
return false;
25+
}
26+
catch(Exception $e)
27+
{
28+
throw new Zend_Exception($e);
29+
}
30+
return $dao;
31+
} // end getByFolder_id()
32+
33+
34+
835
/** Custom save function*/
936
public function save($folder)
1037
{

core/models/cassandra/FolderpolicygroupModel.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?php
2+
require_once BASE_PATH.'/core/models/base/FolderpolicygroupModelBase.php';
3+
24
/**
35
* \class Folderpolicygroup
46
* \brief Cassandra Model
57
*/
6-
class FolderpolicygroupModel extends MIDASFolderpolicygroupModel
8+
class FolderpolicygroupModel extends FolderpolicygroupModelBase
79
{
810
/** getPolicy
911
* @return FolderpolicyuserDao

core/models/cassandra/FolderpolicyuserModel.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?php
2+
require_once BASE_PATH.'/core/models/base/FolderpolicyuserModelBase.php';
3+
24
/**
35
* \class Folderpolicyuser
46
* \brief Cassandra Model
57
*/
6-
class FolderpolicyuserModel extends MIDASFolderpolicyuserModel
8+
class FolderpolicyuserModel extends FolderpolicyuserModelBase
79
{
810
/** getPolicy
911
* @return FolderpolicyuserDao

core/models/cassandra/GroupModel.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?php
2+
require_once BASE_PATH.'/core/models/base/GroupModelBase.php';
3+
24
/**
35
* \class GroupModel
46
* \brief Cassandra Model
57
*/
6-
class GroupModel extends MIDASGroupModel
8+
class GroupModel extends GroupModelBase
79
{
810
/** Add an user to a group
911
* @return void

core/models/cassandra/ItemModel.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?php
2+
require_once BASE_PATH.'/core/models/base/ItemModelBase.php';
3+
24
/**
35
* \class ItemModel
46
* \brief Cassandra Model
57
*/
6-
class ItemModel extends MIDASItemModel
8+
class ItemModel extends ItemModelBase
79
{
810
/** get random items
911
*

core/models/cassandra/UserModel.php

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?php
2+
require_once BASE_PATH.'/core/models/base/UserModelBase.php';
3+
24
/**
35
* \class UserModel
46
* \brief Cassandra Model
57
*/
6-
class UserModel extends MIDASUserModel
8+
class UserModel extends UserModelBase
79
{
810
/** Get a user by email */
911
function getByEmail($email)
@@ -32,6 +34,30 @@ function getByEmail($email)
3234
return $dao;
3335
} // end getByEmail()
3436

37+
/** Get a user by id */
38+
function getByUser_id($userid)
39+
{
40+
// We get from the table emailuser
41+
try
42+
{
43+
$user = new ColumnFamily($this->database->getDB(), 'user');
44+
$userarray = $user->get($userid);
45+
// Add the user_id
46+
$userarray[$this->_key] = $userid;
47+
$dao= $this->initDao('User',$userarray);
48+
}
49+
catch(cassandra_NotFoundException $e)
50+
{
51+
return false;
52+
}
53+
catch(Exception $e)
54+
{
55+
throw new Zend_Exception($e);
56+
}
57+
58+
return $dao;
59+
} // end getByUser_id()
60+
3561
/** Get user communities */
3662
public function getUserCommunities($userDao)
3763
{

0 commit comments

Comments
 (0)