';
+var_dump($this->model->queryText);
+
+ $this->words = [];
+ $this->stmt = null;
+ $vars = $this->buildSelect($options);
+
+ $ids = $this->exec($this->model->queryWords, $vars);
+
+ if ('asc' === $options['sort_dir']) {
+ asort($ids, $this->sortType);
+ } else {
+ arsort($ids, $this->sortType);
+ }
+
+var_dump($ids);
+echo '';
+ exit();
+ }
+
+ /**
+ * Поиск по словам рекурсивного списка
+ *
+ * @param array $words
+ * @param array $vars
+ * @param array $ids
+ *
+ * @return array
+ */
+ protected function exec(array $words, array $vars, array $ids = [])
+ {
+ $type = 'AND';
+ $count = 0;
+
+ foreach ($words as $word) {
+
+var_dump($word);
+
+ // служебное слово
+ if ('AND' === $word || 'OR' === $word || 'NOT' === $word) {
+ $type = $word;
+ continue;
+ }
+
+ // если до сих пор ни чего не найдено и тип операции не ИЛИ, то выполнять не надо
+ if ($count && empty($ids) && 'OR' !== $type) {
+ continue;
+ }
+
+ if (is_array($word) && (! isset($word['type']) || 'CJK' !== $word['type'])) {
+ $ids = $this->exec($word, $vars, $ids);
+ } else {
+ $CJK = false;
+ if (isset($word['type']) && 'CJK' === $word['type']) {
+ $CJK = true;
+ $word = $word['word']; //???? добавить *
+ }
+
+ $word = str_replace(['*', '?'], ['%', '_'], $word);
+
+ if (isset($this->words[$word])) {
+ $list = $this->words[$word];
+ } else {
+ $vars[':word'] = $word;
+
+ if (null === $this->stmt) {
+ $this->stmt = $this->c->DB->prepare($this->selectForIndex, $vars);
+ $this->stmt->execute();
+ } else {
+ $this->stmt->execute($vars);
+ }
+ $this->words[$word] = $list = $this->stmt->fetchAll(PDO::FETCH_KEY_PAIR);
+ }
+
+var_dump($list);
+ if (! $count) {
+ $ids = $list;
+ } elseif ('AND' === $type) {
+ $ids = array_intersect_key($ids, $list);
+ } elseif ('OR' === $type) {
+ $ids += $list;
+ } elseif ('NOT' === $type) {
+ $ids = array_diff_key($ids, $list);
+ }
+ }
+
+ ++$count;
+ }
+
+ return $ids;
+ }
+
+ /**
+ * @param array $options
+ *
+ * @return array
+ */
+ protected function buildSelect(array $options)
+ {
+ # ["keywords"]=> string(5) "fnghj"
+ # ["author"] => string(0) ""
+ # ["forums"] => NULL
+ # ["serch_in"]=> string(3) "all"
+ # ["sort_by"] => string(4) "post"
+ # ["sort_dir"]=> string(4) "desc"
+ # ["show_as"] => string(5) "posts"
+ $vars = [];
+ $where = [];
+ $joinT = false;
+ $joinP = false;
+
+ switch ($options['serch_in']) {
+ case 'posts':
+ $where[] = 'm.subject_match=0';
+ break;
+ case 'topics':
+ $where[] = 'm.subject_match=1';
+ // при поиске в заголовках результат только в виде списка тем
+ $options['show_as'] = 'topics';
+ break;
+ }
+
+ if (! empty($options['forums'])) {
+ $joinT = true;
+ $where[] = 't.forum_id IN (?ai:forums)';
+ $vars[':forums'] = (array) $options['forums'];
+ }
+
+ if ('topics' === $options['show_as']) {
+ $showTopics = true;
+ $joinP = true;
+ $selectF = 'p.topic_id';
+ } else {
+ $showTopics = false;
+ $selectF = 'm.post_id';
+ }
+
+ //???? нужен индекс по авторам сообщений
+ //???? что делать с подчеркиванием в именах?
+ if ('' != $options['author']) {
+ $joinP = true;
+ $vars[':author'] = str_replace(['*', '?'], ['%', '_'], $options['author']);
+ $where[] = 'p.poster LIKE ?s:author';
+ }
+
+ switch ($options['sort_by']) {
+ case 'author':
+ if ($showTopics) {
+ $sortBy = 't.poster';
+ $joinT = true;
+ } else {
+ $sortBy = 'p.poster';
+ $joinP = true;
+ }
+ $this->sortType = SORT_STRING;
+ break;
+ case 'subject':
+ $sortBy = 't.subject';
+ $joinT = true;
+ $this->sortType = SORT_STRING;
+ break;
+ case 'forum':
+ $sortBy = 't.forum_id';
+ $joinT = true;
+ $this->sortType = SORT_NUMERIC;
+ break;
+ default:
+ if ($showTopics) {
+ $sortBy = 't.last_post';
+ $joinT = true;
+ } else {
+ $sortBy = 'm.post_id';
+ }
+ $this->sortType = SORT_NUMERIC;
+ break;
+ }
+
+ $joinP = $joinP || $joinT ? 'INNER JOIN ::posts AS p ON p.id=m.post_id ' : '';
+ $joinT = $joinT ? 'INNER JOIN ::topics AS t ON t.id=p.topic_id ' : '';
+ $where = empty($where) ? '' : ' AND ' . implode(' AND ', $where);
+
+ $this->selectForIndex = "SELECT {$selectF}, {$sortBy} FROM ::search_words AS w " .
+ 'INNER JOIN ::search_matches AS m ON m.word_id=w.id ' .
+ $joinP .
+ $joinT .
+ 'WHERE w.word LIKE ?s:word' . $where;
+
+ return $vars;
+ }
+}
diff --git a/app/Models/Search/Index.php b/app/Models/Search/Index.php
new file mode 100644
index 00000000..0ec4ce0f
--- /dev/null
+++ b/app/Models/Search/Index.php
@@ -0,0 +1,150 @@
+words(mb_strtolower($this->c->Parser->getText(), 'UTF-8'));
+ $subWords = $post->id === $post->parent->first_post_id
+ ? $this->words(mb_strtolower($post->parent->subject, 'UTF-8'))
+ : [];
+
+ if ('add' !== $mode) {
+ $vars = [
+ ':pid' => $post->id,
+ ];
+ $sql = 'SELECT w.id, w.word, m.subject_match
+ FROM ::search_words AS w
+ INNER JOIN ::search_matches AS m ON w.id=m.word_id
+ WHERE m.post_id=?i:pid';
+ $stmt = $this->c->DB->query($sql, $vars);
+
+ $mesCurWords = [];
+ $subCurWords = [];
+ while ($row = $stmt->fetch()) {
+ if ($row['subject_match']) {
+ $subCurWords[$row['word']] = $row['id'];
+ } else {
+ $mesCurWords[$row['word']] = $row['id'];
+ }
+ }
+ }
+
+ $words = [];
+ if ('edit' === $mode) {
+ $words['add']['p'] = array_diff($mesWords, array_keys($mesCurWords));
+ $words['add']['s'] = array_diff($subWords, array_keys($subCurWords));
+ $words['del']['p'] = array_diff_key($mesCurWords, array_flip($mesWords));
+ $words['del']['s'] = array_diff_key($subCurWords, array_flip($subWords));
+ } elseif ('merge' === $mode) {
+ $words['add']['p'] = array_diff($mesWords, array_keys($mesCurWords));
+ $words['add']['s'] = array_diff($subWords, array_keys($subCurWords));
+ $words['del']['p'] = [];
+ $words['del']['s'] = [];
+ } else {
+ $words['add']['p'] = $mesWords;
+ $words['add']['s'] = $subWords;
+ $words['del']['p'] = [];
+ $words['del']['s'] = [];
+ }
+
+ if (empty($words['add']['s'])) {
+ $allWords = $words['add']['p'];
+ } else {
+ $allWords = array_unique(array_merge($words['add']['p'], $words['add']['s']));
+ }
+ if (! empty($allWords)) {
+ $vars = [
+ ':words' => $allWords,
+ ];
+ $sql = 'SELECT word
+ FROM ::search_words
+ WHERE word IN(?as:words)';
+ $oldWords = $this->c->DB->query($sql, $vars)->fetchAll(PDO::FETCH_COLUMN);
+ $newWords = array_diff($allWords, $oldWords);
+
+ if (! empty($newWords)) {
+ $sql = 'INSERT INTO ::search_words (word) VALUES(?s:word)';
+ $stmt = null;
+ foreach ($newWords as $word) {
+ if (null === $stmt) {
+ $stmt = $this->c->DB->prepare($sql, [':word' => $word]);
+ $stmt->execute();
+ } else {
+ $stmt->execute([':word' => $word]);
+ }
+ }
+ }
+ }
+
+ foreach ($words['del'] as $key => $list) {
+ if (empty($list)) {
+ continue;
+ }
+
+ $vars = [
+ ':pid' => $post->id,
+ ':subj' => 's' === $key ? 1 : 0,
+ ':ids' => $list,
+ ];
+ $sql = 'DELETE FROM ::search_matches
+ WHERE word_id IN(?ai:ids) AND post_id=?i:pid AND subject_match=?i:subj';
+ $this->c->DB->exec($sql, $vars);
+ }
+
+ foreach ($words['add'] as $key => $list)
+ {
+ if (empty($list)) {
+ continue;
+ }
+
+ $vars = [
+ ':pid' => $post->id,
+ ':subj' => 's' === $key ? 1 : 0,
+ ':words' => $list,
+ ];
+ $sql = 'INSERT INTO ::search_matches (post_id, word_id, subject_match)
+ SELECT ?i:pid, id, ?i:subj
+ FROM ::search_words
+ WHERE word IN(?as:words)';
+ $this->c->DB->exec($sql, $vars);
+ }
+ }
+
+ /**
+ * Получение слов из текста для построения поискового индекса
+ *
+ * @param string $text
+ *
+ * @return array
+ */
+ protected function words($text)
+ {
+ $text = $this->model->cleanText($text, true);
+
+ $words = [];
+ foreach (array_unique(explode(' ', $text)) as $word) {
+ $word = $this->model->word($word, true);
+ if (null !== $word) {
+ $words[] = $word;
+ }
+ }
+ return $words;
+ }
+}
diff --git a/app/Models/Search/Model.php b/app/Models/Search/Model.php
new file mode 100644
index 00000000..e3edf5ae
--- /dev/null
+++ b/app/Models/Search/Model.php
@@ -0,0 +1,144 @@
+c->Router->link($this->linkMarker, $this->linkArgs);
+ }
+
+ /**
+ * Массив страниц результата поиска
+ *
+ * @return array
+ */
+ protected function getpagination()
+ {
+ return $this->c->Func->paginate($this->numPages, $this->page, $this->linkMarker, $this->linkArgs);
+ }
+
+ /**
+ * Статус наличия установленной страницы в результате поиска
+ *
+ * @return bool
+ */
+ public function hasPage()
+ {
+ return $this->page > 0 && $this->page <= $this->numPages;
+ }
+
+ /**
+ * Очистка текста для дальнейшего разделения на слова
+ *
+ * @param string $text
+ * @param bool $indexing
+ *
+ * @return string
+ */
+ public function cleanText($text, $indexing = false)
+ {
+ $text = str_replace(['`', '’', 'ё'], ['\'', '\'', 'е'], $text);
+ // четыре одинаковых буквы в одну
+ $text = preg_replace('%(\p{L})\1{3,}%u', '\1', $text);
+ // удаление ' и - вне слов
+ $text = preg_replace('%((?c->stopwords->list[$word])) {
+ return null;
+ }
+
+ if ($this->isCJKWord($word)) {
+ return $indexing ? null : $word;
+ }
+
+ $len = mb_strlen(trim($word, '?*'), 'UTF-8');
+
+ if ($len < 3) {
+ return null;
+ }
+
+ if ($len > 20) {
+ $word = mb_substr($word, 0, 20, 'UTF-8');
+ }
+
+ return $word;
+ }
+
+ /**
+ * Проверка слова на язык CJK
+ *
+ * @param string $word
+ *
+ * @return bool
+ */
+ public function isCJKWord($word)
+ {
+ return preg_match('%' . self::CJK_REGEX . '%u', $word) ? true : false; //?????
+ }
+}
diff --git a/app/Models/Search/Prepare.php b/app/Models/Search/Prepare.php
new file mode 100644
index 00000000..bc301fce
--- /dev/null
+++ b/app/Models/Search/Prepare.php
@@ -0,0 +1,210 @@
+model->queryError = 'Odd number of quotes: \'%s\'';
+ $this->model->queryWords = [];
+ $this->model->queryText = $query;
+ return false;
+ }
+
+ $error = null;
+ $this->model->queryWords = null;
+ $this->model->queryText = null;
+
+ $stack = [];
+ $quotes = false;
+ $words = [];
+ $keyword = true;
+ $count = 0;
+
+ foreach (preg_split('%"%', $query) as $subQuery) {
+ // подстрока внутри кавычек
+ if ($quotes) {
+ $subQuery = mb_strtolower(trim($subQuery), 'UTF-8');
+ // не стоп-слово и минимальная длина удовлетворяет условию
+ if (null !== $this->model->word($subQuery)) {
+ // подстрока является словом и нет символов CJK языков
+ if (false === strpos($subQuery, ' ')
+ && ! $this->model->isCJKWord($subQuery)
+ && $this->model->cleanText($subQuery) === $subQuery
+ ) {
+ $words[] = $subQuery;
+ // это не слово или есть символы CJK языков
+ // искать придется через LIKE по тексту сообщений
+ } else {
+ $words[] = ['type' => 'CJK', 'word' => $subQuery];
+ }
+ $keyword = false;
+ ++$count;
+ }
+ $quotes = false;
+ continue;
+ }
+
+ // действуют управляющие слова
+ foreach (
+ preg_split(
+ '%\s*(\b(?:AND|OR|NOT)\b|(?model->cleanText($cur); //????
+ $temp = [];
+ $countT = 0;
+ foreach (explode(' ', $cur) as $word) {
+ $word = $this->model->word($word);
+ if (null === $word) {
+ continue;
+ }
+ if (! empty($temp)) {
+ $temp[] = 'AND';
+ }
+ if ($this->model->isCJKWord($word)) {
+ $temp[] = ['type' => 'CJK', 'word' => $word];
+ } elseif (rtrim($word, '?*') === $word) {
+ $temp[] = $word . '*'; //????
+ } else {
+ $temp[] = $word;
+ }
+ ++$countT;
+ }
+ if ($countT) {
+ if (! $keyword) {
+ $words[] = 'AND';
+ }
+ if (1 === $countT || 'AND' === end($words)) {
+ $words = array_merge($words, $temp);
+ $count += $countT;
+ } else {
+ $words[] = $temp;
+ ++$count;
+ }
+ $keyword = false;
+ }
+ break;
+ }
+ }
+ $quotes = true;
+ }
+
+ if (! $count) {
+ $error = 'There is no word for search: "%s"';
+ } else if ($keyword) {
+ $error = 'Syntactic word at the end of the search query: "%s"';
+ } elseif (! empty($stack)) {
+ $error = 'The order of brackets is broken: \'%s\'';
+ }
+
+ $this->model->queryError = $error;
+ $this->model->queryWords = $words;
+ $this->model->queryText = $this->queryText($words);
+
+ return null === $error;
+ }
+
+ /**
+ * Замена в строке по массиву шаблонов
+ *
+ * @param string $str
+ * @param array $repl
+ *
+ * @return string
+ */
+ protected function repl($str, array $repl)
+ {
+ return preg_replace(array_keys($repl), array_values($repl), $str);
+ }
+
+ /**
+ * Восстановление текста запроса по массиву слов
+ *
+ * @param array $words
+ *
+ * @return string
+ */
+ protected function queryText(array $words)
+ {
+ $space = '';
+ $result = '';
+ foreach ($words as $word) {
+ if (isset($word['type']) && 'CJK' === $word['type']) {
+ $word = '"' . $word['word'] . '"';
+ } elseif (is_array($word)) {
+ $word = '(' . $this->queryText($word) . ')';
+ }
+ $result .= $space . $word;
+ $space = ' ';
+ }
+ return $result;
+ }
+}
diff --git a/app/Models/Stopwords.php b/app/Models/Stopwords.php
index 69248f1f..510e35d5 100644
--- a/app/Models/Stopwords.php
+++ b/app/Models/Stopwords.php
@@ -74,6 +74,7 @@ class Stopwords extends Model
// Tidy up and filter the stopwords
$stopwords = array_map('trim', $stopwords);
$stopwords = array_filter($stopwords);
+ $stopwords = array_flip($stopwords);
$this->c->Cache->set('stopwords', ['id' => $id, 'stopwords' => $stopwords]);
$this->list = $stopwords;
diff --git a/app/Models/Topic/View.php b/app/Models/Topic/View.php
index ae8ebafd..1ce07d21 100644
--- a/app/Models/Topic/View.php
+++ b/app/Models/Topic/View.php
@@ -3,28 +3,41 @@
namespace ForkBB\Models\Topic;
use ForkBB\Models\Action;
+use ForkBB\Models\Forum\Model as Forum;
+use ForkBB\Models\Search\Model as Search;
use ForkBB\Models\Topic\Model as Topic;
use PDO;
+use InvalidArgumentException;
+use RuntimeException;
class View extends Action
{
/**
* Возвращает список тем
*
- * @param array $list
- * @param bool $expanded
+ * @param mixed $arg
*
+ * @throws InvalidArgumentException
+ *
* @return array
*/
- public function view(array $list, $expanded = false)
+ public function view($arg)
{
- if (empty($list)) {
- return [];
+ if ($arg instanceof Forum) {
+ $expanded = false;
+ } elseif ($arg instanceof Search) {
+ $expanded = true;
+ } else {
+ throw new InvalidArgumentException('Expected Forum or Search');
+ }
+
+ if (empty($arg->idsList) || ! is_array($arg->idsList)) {
+ throw new RuntimeException('Model does not contain a list of topics to display');
}
$vars = [
':uid' => $this->c->user->id,
- ':ids' => $list,
+ ':ids' => $arg->idsList,
];
if (! $this->c->user->isGuest && '1' == $this->c->config->o_show_dot) {
@@ -56,7 +69,7 @@ class View extends Action
}
$stmt = $this->c->DB->query($sql, $vars);
- $result = array_flip($list);
+ $result = array_flip($arg->idsList);
while ($row = $stmt->fetch()) {
$row['dot'] = isset($dots[$row['id']]);
$result[$row['id']] = $this->manager->create($row);
diff --git a/app/lang/English/search.po b/app/lang/English/search.po
new file mode 100644
index 00000000..611c5915
--- /dev/null
+++ b/app/lang/English/search.po
@@ -0,0 +1,190 @@
+#
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Project-Id-Version: ForkBB\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: ForkBB {!! __('by') !!} {{ $topic->poster }}
+ @if ($p->showForum) + @endif{{ $cur['value'] }}
- @else -{!! $cur['value'] !!}
- @endif +@if (empty($cur['html'])){{ $cur['value'] }} @else{!! $cur['value'] !!} @endif
@endforeach @elseif (isset($set['fields'])) @endif diff --git a/app/templates/layouts/main.tpl b/app/templates/layouts/main.tpl index c5b4794c..1cfbc334 100644 --- a/app/templates/layouts/main.tpl +++ b/app/templates/layouts/main.tpl @@ -17,7 +17,9 @@{!! $p->fDescription !!}
+@endif