Skip to content

code cleanup and refactor #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yama wants to merge 6 commits into
base: master
Choose a base branch
from
+671 −570
Open

code cleanup and refactor #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
01cfd53
refactor - evoSearch.snippet.php
yama May 11, 2022
f2dba3d
code cleanup, indent and white spaces, etc...
yama May 11, 2022
0508a3d
refactor evoSearch.snippet.php
yama May 11, 2022
87b0a55
fix - evoSearchSnippet::makeWordsFromText()
yama May 11, 2022
ead0dd9
refactor - snippet.class.php
yama May 11, 2022
cd01fb7
refactor
yama May 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 36 additions & 32 deletions assets/plugins/evoSearch/evoSearch.plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,42 @@
<?php
/**
* @var object $modx
*/
if(!defined('MODX_BASE_PATH')) die('What are you doing? Get out of here!');

$e = $modx->Event;
if ($e->name == 'OnDocFormSave') {
include_once('plugin.class.php');
$eSP = new evoSearchPlugin($modx, $e->params);
//проверяем наличие и создаем при необходимости нужные поля и индекса
$eSP->prepareRun();
//теперь начинаем работу
$sql = $eSP->makeSQLForSelectWords();
//echo $sql;die();
$q = $modx->db->query($sql);
$content_fields = explode(',', $eSP->cleanIn($eSP->search_fields));
while ($row = $modx->db->getRow($q)) {
$tmp = array();
foreach($content_fields as $k => $v) {
if (isset($row[$v]) && !empty($row[$v])) {
$tmp[] = $row[$v];
}
if ($modx->event->name !== 'OnDocFormSave') {
return;
}

include_once('plugin.class.php');
$eSP = new evoSearchPlugin($modx, $modx->event->params);
//проверяем наличие и создаем при необходимости нужные поля и индекса
$eSP->prepareRun();
//теперь начинаем работу
$sql = $eSP->makeSQLForSelectWords();
//echo $sql;die();
$q = $modx->db->query($sql);
$content_fields = explode(',', $eSP->cleanIn($eSP->search_fields));
while ($row = $modx->db->getRow($q)) {
$tmp = [];
foreach ($content_fields as $k => $v) {
if (isset($row[$v]) && !empty($row[$v])) {
$tmp[] = $row[$v];
}
$content_original = implode(' ', $tmp);
$content = $modx->stripTags($content_original);
$content = $eSP->injectTVs($row['id'], $content);
$words = $eSP->Words2BaseForm(mb_strtoupper($content, 'UTF-8'));
$fields = array(
$eSP->ext_content_field => $modx->db->escape($content),
$eSP->ext_content_index_field => $modx->db->escape($words),
'docid' => $row['id'],
'pagetitle' => isset($row['pagetitle']) ? $modx->db->escape($row['pagetitle']) : '',
'table' => $eSP->content_table_name
);
$up = $eSP->updateSearchTable($fields);
//die();
}
//удалим строки индексов для исключенных шаблонов и ресурсов
$eSP->emptyExcluded();
$content_original = implode(' ', $tmp);
$content = $modx->stripTags($content_original);
$content = $eSP->injectTVs($row['id'], $content);
$words = $eSP->Words2BaseForm(mb_strtoupper($content, 'UTF-8'));
$up = $eSP->updateSearchTable([
$eSP->ext_content_field => $modx->db->escape($content),
$eSP->ext_content_index_field => $modx->db->escape($words),
'docid' => $row['id'],
'pagetitle' => !isset($row['pagetitle'])
? ''
: $modx->db->escape($row['pagetitle']),
'table' => $eSP->content_table_name
]);
}
//удалим строки индексов для исключенных шаблонов и ресурсов
$eSP->emptyExcluded();
Loading