}
}
+ public function updateContentAndTitle($id, $title, $body, $user_id) {
+ $sql_action = 'UPDATE entries SET content = ?, title = ? WHERE id=? AND user_id=?';
+ $params_action = array($body, $title, $id, $user_id);
+ $query = $this->executeQuery($sql_action, $params_action);
+
+ return $query;
+ }
+
+ public function retrieveUnfetchedEntries($user_id, $limit) {
+
+ $sql_limit = "LIMIT 0,".$limit;
+ if (STORAGE == 'postgres') {
+ $sql_limit = "LIMIT ".$limit." OFFSET 0";
+ }
+
+ $sql = "SELECT * FROM entries WHERE (content = '' OR content IS NULL) AND user_id=? ORDER BY id " . $sql_limit;
+ $query = $this->executeQuery($sql, array($user_id));
+ $entries = $query->fetchAll();
+
+ return $entries;
+ }
+
public function retrieveAll($user_id) {
- $sql = "SELECT * FROM entries WHERE user_id=? ORDER BY id";
+ $sql = "SELECT * FROM entries WHERE content <> '' AND user_id=? ORDER BY id";
$query = $this->executeQuery($sql, array($user_id));
$entries = $query->fetchAll();
public function retrieveOneByURL($url, $user_id) {
$entry = NULL;
- $sql = "SELECT * FROM entries WHERE url=? AND user_id=?";
+ $sql = "SELECT * FROM entries WHERE content <> '' AND url=? AND user_id=?";
$params = array($url, $user_id);
$query = $this->executeQuery($sql, $params);
$entry = $query->fetchAll();
public function getEntriesByView($view, $user_id, $limit = '', $tag_id = 0) {
switch ($view) {
case 'archive':
- $sql = "SELECT * FROM entries WHERE user_id=? AND is_read=? ";
+ $sql = "SELECT * FROM entries WHERE content <> '' AND user_id=? AND is_read=? ";
$params = array($user_id, 1);
break;
case 'fav' :
- $sql = "SELECT * FROM entries WHERE user_id=? AND is_fav=? ";
+ $sql = "SELECT * FROM entries WHERE content <> '' AND user_id=? AND is_fav=? ";
$params = array($user_id, 1);
break;
case 'tag' :
$sql = "SELECT entries.* FROM entries
LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id
- WHERE entries.user_id=? AND tags_entries.tag_id = ? ";
+ WHERE entries.content <> '' AND
+ entries.user_id=? AND tags_entries.tag_id = ? ";
$params = array($user_id, $tag_id);
break;
default:
- $sql = "SELECT * FROM entries WHERE user_id=? AND is_read=? ";
+ $sql = "SELECT * FROM entries WHERE content <> '' AND user_id=? AND is_read=? ";
$params = array($user_id, 0);
break;
}
return $entries;
}
- public function getEntriesByViewCount($view, $user_id, $tag_id = 0) {\r
- switch ($view) {\r
+ public function getEntriesByViewCount($view, $user_id, $tag_id = 0) {
+ switch ($view) {
case 'archive':
- $sql = "SELECT count(*) FROM entries WHERE user_id=? AND is_read=? ";\r
+ $sql = "SELECT count(*) FROM entries WHERE content <> '' AND user_id=? AND is_read=? ";
$params = array($user_id, 1);
break;
case 'fav' :
- $sql = "SELECT count(*) FROM entries WHERE user_id=? AND is_fav=? ";\r
+ $sql = "SELECT count(*) FROM entries WHERE content <> '' AND user_id=? AND is_fav=? ";
$params = array($user_id, 1);
break;
- case 'tag' :\r
- $sql = "SELECT count(*) FROM entries\r
- LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id\r
- WHERE entries.user_id=? AND tags_entries.tag_id = ? ";\r
- $params = array($user_id, $tag_id);\r
- break;\r
+ case 'tag' :
+ $sql = "SELECT count(*) FROM entries
+ LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id
+ WHERE entries.content <> '' AND
+ entries.user_id=? AND tags_entries.tag_id = ? ";
+ $params = array($user_id, $tag_id);
+ break;
default:
- $sql = "SELECT count(*) FROM entries WHERE user_id=? AND is_read=? ";\r
+ $sql = "SELECT count(*) FROM entries WHERE content <> '' AND user_id=? AND is_read=? ";
$params = array($user_id, 0);
break;
}
$query = $this->executeQuery($sql, $params);
list($count) = $query->fetch();
- return $count;\r
+ return $count;
}
public function updateContent($id, $content, $user_id) {
$sql = "SELECT DISTINCT tags.* FROM tags
LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
LEFT JOIN entries ON tags_entries.entry_id=entries.id
- WHERE entries.user_id=?";
+ WHERE entries.content <> '' AND entries.user_id=?";
$query = $this->executeQuery($sql, array($user_id));
$tags = $query->fetchAll();
$sql = "SELECT DISTINCT tags.* FROM tags
LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
LEFT JOIN entries ON tags_entries.entry_id=entries.id
- WHERE tags.id=? AND entries.user_id=?";
+ WHERE entries.content <> '' AND tags.id=? AND entries.user_id=?";
$params = array(intval($id), $user_id);
$query = $this->executeQuery($sql, $params);
$tag = $query->fetchAll();
$sql =
"SELECT entries.* FROM entries
LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id
- WHERE tags_entries.tag_id = ? AND entries.user_id=?";
+ WHERE entries.content <> '' AND
+ tags_entries.tag_id = ? AND entries.user_id=?";
$query = $this->executeQuery($sql, array($tag_id, $user_id));
$entries = $query->fetchAll();