aboutsummaryrefslogtreecommitdiffhomepage
path: root/application
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2016-02-02 19:42:48 +0100
committerArthurHoaro <arthur@hoa.ro>2016-02-15 21:38:45 +0100
commit522b278b03280ed809025ebbeb3eac284b68bf81 (patch)
tree9d64988c49fd53978c58c64bbd013a363c5b2d78 /application
parentbedd176a5406003631da42366736fd5ebae29135 (diff)
downloadShaarli-522b278b03280ed809025ebbeb3eac284b68bf81.tar.gz
Shaarli-522b278b03280ed809025ebbeb3eac284b68bf81.tar.zst
Shaarli-522b278b03280ed809025ebbeb3eac284b68bf81.zip
Support text search across link fields.
Diffstat (limited to 'application')
-rw-r--r--application/LinkFilter.php48
1 files changed, 23 insertions, 25 deletions
diff --git a/application/LinkFilter.php b/application/LinkFilter.php
index e2ef94ea..17594e8f 100644
--- a/application/LinkFilter.php
+++ b/application/LinkFilter.php
@@ -138,6 +138,7 @@ class LinkFilter
138 */ 138 */
139 private function filterFulltext($searchterms, $privateonly = false) 139 private function filterFulltext($searchterms, $privateonly = false)
140 { 140 {
141 $filtered = array();
141 $search = mb_convert_case(html_entity_decode($searchterms), MB_CASE_LOWER, 'UTF-8'); 142 $search = mb_convert_case(html_entity_decode($searchterms), MB_CASE_LOWER, 'UTF-8');
142 $exactRegex = '/"([^"]+)"/'; 143 $exactRegex = '/"([^"]+)"/';
143 // Retrieve exact search terms. 144 // Retrieve exact search terms.
@@ -169,35 +170,32 @@ class LinkFilter
169 continue; 170 continue;
170 } 171 }
171 172
172 // Iterate over searchable link fields. 173 // Concatenate link fields to search across fields.
174 // Adds a '\' separator for exact search terms.
175 $content = '';
173 foreach ($keys as $key) { 176 foreach ($keys as $key) {
174 // Be optimistic 177 $content .= mb_convert_case($link[$key], MB_CASE_LOWER, 'UTF-8') . '\\';
175 $found = true; 178 }
176
177 $haystack = mb_convert_case($link[$key], MB_CASE_LOWER, 'UTF-8');
178
179 // First, we look for exact term search
180 for ($i = 0; $i < count($exactSearch) && $found; $i++) {
181 $found = strpos($haystack, $exactSearch[$i]) !== false;
182 }
183 179
184 // Iterate over keywords, if keyword is not found, 180 // Be optimistic
185 // no need to check for the others. We want all or nothing. 181 $found = true;
186 for ($i = 0; $i < count($andSearch) && $found; $i++) {
187 $found = strpos($haystack, $andSearch[$i]) !== false;
188 }
189 182
190 // Exclude terms. 183 // First, we look for exact term search
191 for ($i = 0; $i < count($excludeSearch) && $found; $i++) { 184 for ($i = 0; $i < count($exactSearch) && $found; $i++) {
192 $found = strpos($haystack, $excludeSearch[$i]) === false; 185 $found = strpos($content, $exactSearch[$i]) !== false;
193 } 186 }
194 187
195 // One of the fields of the link matches, no need to check the other. 188 // Iterate over keywords, if keyword is not found,
196 if ($found) { 189 // no need to check for the others. We want all or nothing.
197 break; 190 for ($i = 0; $i < count($andSearch) && $found; $i++) {
198 } 191 $found = strpos($content, $andSearch[$i]) !== false;
199 } 192 }
200 193
194 // Exclude terms.
195 for ($i = 0; $i < count($excludeSearch) && $found; $i++) {
196 $found = strpos($content, $excludeSearch[$i]) === false;
197 }
198
201 if ($found) { 199 if ($found) {
202 $filtered[$link['linkdate']] = $link; 200 $filtered[$link['linkdate']] = $link;
203 } 201 }