diff options
author | Alessandro Cosentino <cosenal@gmail.com> | 2013-03-03 22:27:18 +0100 |
---|---|---|
committer | Alessandro Cosentino <cosenal@gmail.com> | 2013-03-03 22:27:18 +0100 |
commit | ef450898bb702877dafb755e425fe8f37b23417b (patch) | |
tree | 53162b432a7f5a6c9d99d9eb77aee30d670853ae /db | |
parent | 0852773340ed26ecc8faa8e61192f38132673bc6 (diff) |
create folder api call
Diffstat (limited to 'db')
-rw-r--r-- | db/feed.php | 2 | ||||
-rw-r--r-- | db/feedmapper.php | 5 | ||||
-rw-r--r-- | db/folder.php | 13 | ||||
-rw-r--r-- | db/itemmapper.php | 4 |
4 files changed, 18 insertions, 6 deletions
diff --git a/db/feed.php b/db/feed.php index 8ab772ab9..eda225302 100644 --- a/db/feed.php +++ b/db/feed.php @@ -25,7 +25,7 @@ class Feed extends Collection { // if $items = null, it means that feed has not been fetched yet // if $id = null, it means that the feed has not been stored in the db yet - public function __construct($url, $title, $items = null, $id = null) { + public function __construct($url, $title = null, $items = null, $id = null) { $this->url = $url; $this->title = $title; if ($items !== null) { diff --git a/db/feedmapper.php b/db/feedmapper.php index 906ced069..62a7d41f5 100644 --- a/db/feedmapper.php +++ b/db/feedmapper.php @@ -163,10 +163,10 @@ class FeedMapper { */ //TODO: handle error case public function save(Feed $feed, $folderid) { - $title = $feed->getTitle(); $url = $feed->getUrl(); $url_hash = md5($url); + $title = $feed->getTitle(); if(empty($title)) { $l = \OC_L10N::get('news'); $title = $l->t('no title'); @@ -199,11 +199,12 @@ class FeedMapper { //update the db. it needs to be done, since it might be the first save after a full fetch $stmt = \OCP\DB::prepare(' UPDATE ' . self::tableName . - ' SET favicon_link = ? , lastmodified = UNIX_TIMESTAMP() , folder_id = ? + ' SET title = ? , favicon_link = ? , lastmodified = UNIX_TIMESTAMP() , folder_id = ? WHERE id = ? '); $params=array( + $title, $favicon, $folderid, $feedid diff --git a/db/folder.php b/db/folder.php index 23d33737f..5dfa738f3 100644 --- a/db/folder.php +++ b/db/folder.php @@ -51,6 +51,12 @@ class Folder extends Collection { public function setOpened($opened) { $this->opened = $opened; } + + public function setParentId() { + if ($this->parent !== null) { + + } + } public function getParentId() { if ($this->parent === null) { @@ -73,7 +79,12 @@ class Folder extends Collection { public function jsonSerialize() { //TODO: this is just for test - return $this->name; + $encoding = array( + 'id' => $this->getId(), + 'parentId' => $this->getParentId(), + 'title' => $this->getName(), + ); + return $encoding; } }
\ No newline at end of file diff --git a/db/itemmapper.php b/db/itemmapper.php index 3399e2e03..3791c3a49 100644 --- a/db/itemmapper.php +++ b/db/itemmapper.php @@ -355,7 +355,7 @@ class ItemMapper { break; case FeedType::FOLDER: - $feedMapper = new FeedMapper($this->userId); + $feedMapper = new FeedMapper($this->userid); $feeds = $feedMapper->findByFolderId($feedId); foreach($feeds as $feed){ $unreadCount += $this->countAllStatus($feed->getId(), StatusFlag::UNREAD); @@ -405,7 +405,7 @@ class ItemMapper { // folder } elseif ($feedType === FeedType::FOLDER){ - $feedMapper = new FeedMapper($this->userId); + $feedMapper = new FeedMapper($this->userid); $feeds = $feedMapper->findByFolderId($feedId); foreach($feeds as $feed){ |