git.cweiske.de
/
grauphel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let the SQL server filter notes
[grauphel.git]
/
lib
/
notestorage.php
diff --git
a/lib/notestorage.php
b/lib/notestorage.php
index 621d12062979c35ed2e193b82903d47f6f853a7b..27bb7025770f8327ea1059887978fc286d0a2da2 100644
(file)
--- a/
lib/notestorage.php
+++ b/
lib/notestorage.php
@@
-287,8
+287,8
@@
class NoteStorage
$keywordGroups['NOT'] = array();
}
$keywordGroups['NOT'] = array();
}
- $sqlTplAnd = ' AND (note_title
LIKE ? OR note_tags LIKE ? OR note_content
LIKE ?)';
- $sqlTplNot = ' AND NOT (note_title
LIKE ? OR note_tags LIKE ? OR note_content
LIKE ?)';
+ $sqlTplAnd = ' AND (note_title
ILIKE ? OR note_tags ILIKE ? OR note_content I
LIKE ?)';
+ $sqlTplNot = ' AND NOT (note_title
ILIKE ? OR note_tags ILIKE ? OR note_content I
LIKE ?)';
$arData = array(
$this->username
);
$arData = array(
$this->username
);
@@
-397,15
+397,18
@@
class NoteStorage
public function loadNotesOverview(
$since = null, $rawtag = null, $includeDate = false
) {
public function loadNotesOverview(
$since = null, $rawtag = null, $includeDate = false
) {
- $
result = \OC_DB::executeAudited(
-
'SELECT `note_guid`, `note_title`
, `note_last_sync_revision`, `note_tags`'
+ $
sql = 'SELECT `note_guid`, `note_title`'
+
. '
, `note_last_sync_revision`, `note_tags`'
. ', `note_last_change_date`'
. ' FROM `*PREFIX*grauphel_notes`'
. ', `note_last_change_date`'
. ' FROM `*PREFIX*grauphel_notes`'
- . ' WHERE note_user = ?',
- array($this->username)
- );
+ . ' WHERE note_user = ?';
+ $sqlData = array($this->username);
+
+ if ($since !== null) {
+ $sqlData[] = $since;
+ $sql .= ' AND note_last_sync_revision > ?';
+ }
- $notes = array();
if ($rawtag == 'grauphel:special:all') {
$rawtag = null;
} else if ($rawtag == 'grauphel:special:untagged') {
if ($rawtag == 'grauphel:special:all') {
$rawtag = null;
} else if ($rawtag == 'grauphel:special:untagged') {
@@
-413,13
+416,14
@@
class NoteStorage
} else {
$jsRawtag = json_encode($rawtag);
}
} else {
$jsRawtag = json_encode($rawtag);
}
+ if ($rawtag !== null) {
+ $sqlData[] = '%' . $jsRawtag . '%';
+ $sql .= ' AND note_tags LIKE ?';
+ }
+
+ $result = \OC_DB::executeAudited($sql, $sqlData);
+ $notes = array();
while ($row = $result->fetchRow()) {
while ($row = $result->fetchRow()) {
- if ($since !== null && $row['note_last_sync_revision'] <= $since) {
- continue;
- }
- if ($rawtag !== null && strpos($row['note_tags'], $jsRawtag) === false) {
- continue;
- }
$note = array(
'guid' => $row['note_guid'],
'ref' => array(
$note = array(
'guid' => $row['note_guid'],
'ref' => array(
@@
-432,7
+436,14
@@
class NoteStorage
)
)
),
)
)
),
- 'href' => null,//FIXME
+ 'href' => $this->urlGen->getAbsoluteURL(
+ $this->urlGen->linkToRoute(
+ 'grauphel.gui.note',
+ array(
+ 'guid' => $row['note_guid']
+ )
+ )
+ ),
),
'title' => $row['note_title'],
);
),
'title' => $row['note_title'],
);