FbIN/htmly
1
0
Fork 0
mirror of https://github.com/danpros/htmly.git synced 2026-04-21 04:56:23 +05:30
Code Issues Projects Releases Packages Wiki Activity

Improve the search

Browse source 
Improve the search speed
This commit is contained in:
Danang Probo Sayekti 2014-02-11 15:30:52 +07:00
commit d8cbaefad2
2 changed files with 41 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

7
system/htmly.php
View file

@ -939,12 +939,9 @@ get('/search/:keyword', function($keyword){
$page = $page ? (int)$page : 1; $page = $page ? (int)$page : 1;
$perpage = config('search.perpage'); $perpage = config('search.perpage');
$posts = get_keyword($keyword); $posts = get_keyword($keyword, $page, $perpage);
$total = count($posts); $total = keyword_count($keyword);
// Extract a specific page with results
$posts = array_slice($posts, ($page-1) * $perpage, $perpage);
if(empty($posts) || $page < 1){ if(empty($posts) || $page < 1){
// a non-existing page // a non-existing page

116
system/includes/functions.php
View file

@ -418,92 +418,31 @@ function get_static_post($static){
} }
// Return search page. // Return search page.
function get_keyword($keyword){ function get_keyword($keyword, $page, $perpage){
$posts = get_post_unsorted(); $posts = get_post_sorted();
$tmp = array(); $tmp = array();
$words = explode(' ', $keyword); $words = explode(' ', $keyword);
if(!empty($posts)) { foreach ($posts as $index => $v) {
$arr = explode('_', $v['filename']);
foreach($posts as $index => $v){ $filter = $arr[1] .' '. $arr[2];
foreach ($words as $word) { foreach($words as $word) {
if(strpos($v, strtolower($word)) !== false){ if(strpos($filter, strtolower($word)) !== false) {
$tmp[] = $v;
$post = new stdClass;
// Extract the date
$arr = explode('_', $v);
// Replaced string
$replaced = substr($arr[0], 0,strrpos($arr[0], '/')) . '/';
// Author string
$str = explode('/', $replaced);
$author = $str[count($str)-3];
// The post author + author url
$post->author = $author;
$post->authorurl = site_url() . 'author/' . $author;
$dt = str_replace($replaced,'',$arr[0]);
$t = str_replace('-', '', $dt);
$time = new DateTime($t);
$timestamp= $time->format("Y-m-d H:i:s");
// The post date
$post->date = strtotime($timestamp);
// The post URL
$post->url = site_url().date('Y/m', $post->date).'/'.str_replace('.md','',$arr[2]);
$tag = array();
$url = array();
$bc = array();
$t = explode(',', $arr[1]);
foreach($t as $tt) {
$tag[] = array($tt, site_url(). 'tag/' . $tt);
}
foreach($tag as $a) {
$url[] = '<span><a href="' . $a[1] . '">'. $a[0] .'</a></span>';
$bc[] = '<span typeof="v:Breadcrumb"><a property="v:title" rel="v:url" href="' . $a[1] . '">'. $a[0] .'</a></span>';
}
$post->tag = implode(', ', $url);
$post->tagb = implode(' » ', $bc);
$content = MarkdownExtra::defaultTransform(file_get_contents($v));
// Extract the title and body
$arr = explode('t-->', $content);
if(isset($arr[1])) {
$title = str_replace('<!--t','',$arr[0]);
$title = rtrim(ltrim($title, ' '), ' ');
$post->title = $title;
$post->body = $arr[1];
}
else {
$post->title = 'Untitled: ' . date('l jS \of F Y', $post->date);
$post->body = $arr[0];
}
$tmp[] = $post;
}
} }
} }
$tmp = array_unique($tmp, SORT_REGULAR);
usort($tmp,'sortdate');
} }
return $tmp; if(empty($tmp)) {
// a non-existing page
render('404-search', null, false);
die;
}
return $tmp = get_posts($tmp, $page, $perpage);
} }
@ -554,6 +493,31 @@ function get_count($var, $str) {
} }
// Return seaarch result count
function keyword_count($keyword) {
$posts = get_post_sorted();
$tmp = array();
$words = explode(' ', $keyword);
foreach ($posts as $index => $v) {
$arr = explode('_', $v['filename']);
$filter = $arr[1] .' '. $arr[2];
foreach($words as $word) {
if(strpos($filter, strtolower($word)) !== false) {
$tmp[] = $v;
}
}
}
$tmp = array_unique($tmp, SORT_REGULAR);
return count($tmp);
}
// Return an archive list, categorized by year and month. // Return an archive list, categorized by year and month.
function archive_list() { function archive_list() {