Skip to content

Commit

Permalink
Merge pull request #189 from lincanbin/develop
Browse files Browse the repository at this point in the history 
Advanced search #188
  • Loading branch information
@lincanbin
lincanbin authored Jun 17, 2016
2 parents 9862854 + 00b9f8a commit 7e87f10
Show file tree
Hide file tree
Showing 8 changed files with 262 additions and 183 deletions.
272 changes: 168 additions & 104 deletions search.php
View file
Original file line number Diff line number Diff line change
@@ -1,104 +1,168 @@
<?php
define('FullTableScanTopicLimit', 50000);//当全站主题数量小于该值将会使用更消耗资源的全表扫描搜索
require(__DIR__ . '/common.php');
require(__DIR__ . '/language/' . ForumLanguage . '/home.php');
include __DIR__ . '/'. 'includes/SearchClient.class.php' ;

$Page = Request('Get', 'page');
$Keyword = Request('Get', 'keyword');
$KeywordArray = explode(" ", $Keyword);
$KeywordNum = count($KeywordArray);
$Error = '';
if(!$KeywordNum){
AlertMsg('404 Not Found', '404 Not Found', 404);
}
if ($Page < 0 || $Page == 1)
Redirect('search/' . $Keyword);
if ($Page == 0)
$Page = 1;

$limitSize = 30;

//如果定义了搜索服务器，就走搜索服务
if( defined('SearchServer') && SearchServer ) {
try {
$finds = SearchClient::searchLike( $Keyword, 'PostsIndexes' //关键字及索引
, ($Page-1)*$limitSize, $limitSize //页码
, ""//过滤条件
, 'PostTime desc' //排序规则
);
if ( !empty($finds) ) {
$num = $finds[1];
$postIds = isset( $finds[0]['id'] ) ?$finds[0]['id']: null;
if( count($postIds ) > 0 ) {
$TopicsArray = $DB->query('SELECT t.`ID`, `Topic`, `Tags`, t.`UserID`, t.`UserName`, t.`LastName`, `LastTime`, `Replies`
, p.Content, p.ID as pID, p.PostTime
FROM ' . PREFIX . 'topics t, '. PREFIX . 'posts p
WHERE t.ID=p.TopicID and p.ID in (?) and t.IsDel=0
ORDER BY p.PostTime DESC',
$postIds);
foreach( $TopicsArray as &$row ) {
$excerpts = SearchClient::callProxy( 'buildExcerpts', array(
array($row['Topic'], $row['Content']), 'PostsIndexes'
, $Keyword, array(
"before_match" => '<span class="search-keyword">',
"after_match"=> "</span>" ) ) );
$row['MinContent'] = $excerpts[1];
}
}
}
}catch( Exception $e ) {
$Error = $e->getMessage();
}
} else {
//if($CurUserID && $Config['NumTopics'] <= FullTableScanTopicLimit){
if($Config['NumTopics'] <= FullTableScanTopicLimit){
$QueryString = str_repeat('or Topic LIKE ? or Tags LIKE ? ', $KeywordNum-1);
$SQLKeywordArray = array();
foreach ($KeywordArray as $Value) {
$SQLKeywordArray[] = '%'.$Value.'%';
$SQLKeywordArray[] = '%'.$Value.'%';
}
$TopicsArray = $DB->query('SELECT `ID`, `Topic`, `Tags`, `UserID`, `UserName`, `LastName`, `LastTime`, `Replies` FROM ' . PREFIX . 'topics
WHERE Topic LIKE ? or Tags LIKE ? '.$QueryString.'
ORDER BY LastTime DESC
LIMIT ' . ($Page - 1) * $Config['TopicsPerPage'] . ',' . $Config['TopicsPerPage'],
$SQLKeywordArray
);
}else{
$QueryString = str_repeat('or Name LIKE ? ', $KeywordNum-1);
$SQLKeywordArray = array();
foreach ($KeywordArray as $Value) {
$SQLKeywordArray[] = '%'.$Value.'%';
}
$TagIDList = $DB->column('SELECT ID FROM ' . PREFIX . 'tags
WHERE Name like ? '.$QueryString,
$SQLKeywordArray
);
if (!$TagIDList)
AlertMsg('404 Not Found', '404 Not Found');
$TagIDArray = $DB->column('SELECT TopicID FROM ' . PREFIX . 'posttags
WHERE TagID in (?)
ORDER BY TopicID DESC
LIMIT ' . ($Page - 1) * $Config['TopicsPerPage'] . ',' . $Config['TopicsPerPage'],
$TagIDList);
$TopicsArray = array();
if($TagIDArray){
$TopicsArray = $DB->query('SELECT `ID`, `Topic`, `Tags`, `UserID`, `UserName`, `LastName`, `LastTime`, `Replies` FROM ' . PREFIX . 'topics
force index(PRI)
WHERE ID in (?) and IsDel=0
ORDER BY LastTime DESC',
$TagIDArray);
}
}
}
/*
if($Page == 1 && !$TopicsArray){
AlertMsg('404 Not Found', '404 Not Found', 404);
}
*/
$DB->CloseConnection();
$PageTitle = $Lang['Search'].' '.$Keyword.' ';
$PageTitle .= $Page > 1 ? ' Page' . $Page : '';
$ContentFile = $TemplatePath . 'search.php';
include($TemplatePath . 'layout.php');
<?php
require(__DIR__ . '/common.php');
require(__DIR__ . '/language/' . ForumLanguage . '/home.php');
include __DIR__ . '/includes/SearchClient.class.php';

$Page = Request('Get', 'page');
$Keyword = Request('Get', 'keyword');
$KeywordArray = array_unique(explode(" ", $Keyword));
$Error = '';

$PostsSearch = false;//是否启用帖子搜索
$PostsSearchOffset = array_search('post:true', $KeywordArray);
if ($PostsSearchOffset !== false) {
$PostsSearch = true;
unset($KeywordArray[$PostsSearchOffset]);
}
ksort($KeywordArray);

if (!$KeywordArray) {
AlertMsg('404 Not Found', '404 Not Found', 404);
}
if ($Page < 0 || $Page == 1)
Redirect('search/' . $Keyword);
if ($Page == 0)
$Page = 1;

$SQLKeywordArray = array();//查询关键字参数数组
$AdvancedSearch = false;
$NormalQuery = array();//普通查询条件，用OR连接
$AdvancedQuery = array();//高级查询条件，用AND连接
//关键词预处理
foreach ($KeywordArray as $Key => $KeywordToken) {
//匹配用户名限制条件
preg_match('/user:(.*)/i', $KeywordToken, $SearchUserTopics);
if (!empty($SearchUserTopics[1]) && IsName($SearchUserTopics[1])){
$AdvancedSearch = true;
break;
}
}

// 禁止普通用户使用无索引的全文搜索
if (!$AdvancedSearch && $CurUserRole < 2) {
$PostsSearch = false;
}
foreach ($KeywordArray as $Key => $KeywordToken) {
//匹配用户名限制条件
preg_match('/user:(.*)/i', $KeywordToken, $SearchUserTopics);
if (!empty($SearchUserTopics[1]) && IsName($SearchUserTopics[1])){
if ($PostsSearch) {
$AdvancedQuery[] = 'p.UserName = :PostUser';
$SQLKeywordArray['PostUser'] = $SearchUserTopics[1];
} else {
$AdvancedQuery[] = 't.UserName = :TopicUser';
$SQLKeywordArray['TopicUser'] = $SearchUserTopics[1];
}
} else {
$ParamName = substr(md5($KeywordToken), 0, 8);
if ($PostsSearch) {
$NormalQuery[] = 'p.Subject LIKE :Subject' . $ParamName . ' or p.Content LIKE :Content' . $ParamName;
$SQLKeywordArray['Subject' . $ParamName] = '%' . $KeywordToken . '%';
$SQLKeywordArray['Content' . $ParamName] = '%' . $KeywordToken . '%';
} else {
$NormalQuery[] = 't.Topic LIKE :Topic' . $ParamName . ' or t.Tags LIKE :Tag' . $ParamName;
$SQLKeywordArray['Topic' . $ParamName] = '%' . $KeywordToken . '%';
$SQLKeywordArray['Tag' . $ParamName] = '%' . $KeywordToken . '%';
}
}
}

$SearchCondition = array();
$Temp = implode(' AND ', $AdvancedQuery);
if (!empty($Temp)) {
$SearchCondition[] = $Temp;
}
$Temp = implode(' OR ', $NormalQuery);
if (!empty($Temp)) {
$SearchCondition[] = '(' . $Temp . ')';
}
unset($Temp);
$SearchConditionQuery = implode(' AND ', $SearchCondition);

//如果定义了搜索服务器，并且不是高级搜索，就走搜索服务
if (defined('SearchServer') && SearchServer && !$AdvancedSearch) {
try {
$finds = SearchClient::searchLike($Keyword, 'PostsIndexes' //关键字及索引
, ($Page - 1) * $Config['TopicsPerPage'], $Config['TopicsPerPage']
, "" //过滤条件
, 'PostTime desc' //排序规则
);
if (!empty($finds)) {
$num = $finds[1];
$PostIdList = isset($finds[0]['id']) ? $finds[0]['id'] : null;
if (count($PostIdList) > 0) {
$TopicsArray = $DB->query('SELECT
t.`ID`,
t.`Topic`,
t.`Tags`,
t.`LastName`,
t.`Replies`,
p.`UserID`,
p.`UserName`,
p.`Content`,
p.`ID` AS PostID,
p.`PostTime` AS LastTime
FROM ' . PREFIX . 'topics t, ' . PREFIX . 'posts p
WHERE t.ID=p.TopicID and p.ID in (?) and t.IsDel=0
ORDER BY p.PostTime DESC', $PostIdList);
foreach ($TopicsArray as &$row) {
$excerpts = SearchClient::callProxy('buildExcerpts', array(
array(
$row['Topic'],
$row['Content']
),
'PostsIndexes',
$Keyword,
array(
"before_match" => '<span class="search-keyword">',
"after_match" => "</span>"
)
));
$row['MinContent'] = $excerpts[1];
}
}
}
}
catch (Exception $e) {
$Error = $e->getMessage();
}
} else {
if ($PostsSearch) {
$SearchFields = 'SELECT
t.`ID`,
t.`Topic`,
t.`Tags`,
t.`LastName`,
t.`Replies`,
p.`UserID`,
p.`UserName`,
p.`Content`,
p.`ID` AS PostID,
p.`PostTime` AS LastTime
FROM ' . PREFIX . 'posts p
LEFT JOIN ' . PREFIX . 'topics t
ON t.ID=p.TopicID';
} else {
$SearchFields = 'SELECT t.`ID`, t.`Topic`, t.`Tags`, t.`UserID`, t.`UserName`, t.`LastName`, t.`LastTime`, t.`Replies`
FROM ' . PREFIX . 'topics t ';
}
$TopicsArray = $DB->query($SearchFields . '
WHERE ' . $SearchConditionQuery . '
ORDER BY LastTime DESC
LIMIT ' . ($Page - 1) * $Config['TopicsPerPage'] . ', ' . $Config['TopicsPerPage'], $SQLKeywordArray);
if ($PostsSearch) {
foreach ($TopicsArray as &$Topic) {
$Topic['MinContent'] = strip_tags(mb_substr($Topic['Content'], 0, 300, 'utf-8'),'<p><br>');
}
}
}
/*
if($Page == 1 && !$TopicsArray){
AlertMsg('404 Not Found', '404 Not Found', 404);
}
*/
$DB->CloseConnection();
$PageTitle = $Lang['Search'] . ' ' . $Keyword . ' ';
$PageTitle .= $Page > 1 ? ' Page' . $Page : '';
$ContentFile = $TemplatePath . 'search.php';
include($TemplatePath . 'layout.php');
17 changes: 7 additions & 10 deletions static/editor/dialogs/video/video.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,13 @@
dialog.onok = function(){
$G("preview").innerHTML = "";
var currentTab = findFocus("tabHeads","tabSrc");
switch(currentTab){
switch(currentTab) {
case "video":
return insertSingle();
break;
case "videoSearch":
return insertSearch("searchList");
break;
case "upload":
return insertUpload();
break;
}
};
dialog.oncancel = function(){
Expand Down Expand Up @@ -139,8 +136,8 @@
if(img.getAttribute("selected")){
videoObjs.push({
url:img.getAttribute("ue_video_url"),
width:420,
height:280,
width:650,
height:380,
align:"none"
});
}
Expand Down Expand Up @@ -273,8 +270,8 @@
$G("preview").innerHTML = '<div class="previewMsg"><span>'+lang.urlError+'</span></div>'+
'<embed class="previewVideo" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer"' +
' src="' + conUrl + '"' +
' width="' + 420 + '"' +
' height="' + 280 + '"' +
' width="' + 650 + '"' +
' height="' + 380 + '"' +
' wmode="transparent" play="true" loop="false" menu="false" allowscriptaccess="never" allowfullscreen="true" >' +
'</embed>';
}
Expand All @@ -284,8 +281,8 @@
function insertUpload(){
var videoObjs=[],
uploadDir = editor.getOpt('videoUrlPrefix'),
width = $G('upload_width').value || 420,
height = $G('upload_height').value || 280,
width = $G('upload_width').value || 650,
height = $G('upload_height').value || 380,
align = findFocus("upload_alignment","name") || 'none';
for(var key in uploadVideoList) {
var file = uploadVideoList[key];
Expand Down
Loading

0 comments on commit 7e87f10

Please sign in to comment.