harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improvements to documentation search

Browse Source
This commit is contained in:
redmatrix 2015-08-30 20:47:15 -07:00
parent a42b236587
commit 7ba1217a13
2 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
mod/help.php
View File

@ -12,9 +12,6 @@
function load_doc_file($s) { function load_doc_file($s) {
$lang = get_app()->language; $lang = get_app()->language;
if(! isset($lang)) if(! isset($lang))
@ -32,21 +29,6 @@ function load_doc_file($s) {
} }
function find_doc_file($s) { function find_doc_file($s) {
// If the file was edited more recently than we've stored a copy in the database, use the file.
// The stored database item will be searchable, the file won't be.
$r = q("select item.* from item left join item_id on item.id = item_id.iid where service = 'docfile' and
sid = '%s' and item_type = %d limit 1",
dbesc($s),
intval(ITEM_TYPE_DOC)
);
if($r) {
if(file_exists($s) && (filemtime($s) > datetime_convert('UTC','UTC',$r[0]['edited'],'U')))
return file_get_contents($s);
return($r[0]['body']);
}
if(file_exists($s)) if(file_exists($s))
return file_get_contents($s); return file_get_contents($s);
return ''; return '';
@ -60,9 +42,6 @@ function search_doc_files($s) {
$a->set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); $a->set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval($a->pager['itemspage']), intval($a->pager['start'])); $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval($a->pager['itemspage']), intval($a->pager['start']));
// If the file was edited more recently than we've stored a copy in the database, use the file.
// The stored database item will be searchable, the file won't be.
$regexop = db_getfunc('REGEXP'); $regexop = db_getfunc('REGEXP');
$r = q("select item_id.sid, item.* from item left join item_id on item.id = item_id.iid where service = 'docfile' and $r = q("select item_id.sid, item.* from item left join item_id on item.id = item_id.iid where service = 'docfile' and
@ -72,11 +51,10 @@ function search_doc_files($s) {
); );
$r = fetch_post_tags($r,true); $r = fetch_post_tags($r,true);
require_once('include/html2plain.php');
for($x = 0; $x < count($r); $x ++) { for($x = 0; $x < count($r); $x ++) {
$r[$x]['text'] = html2plain(prepare_text($r[$x]['body'],$r[$x]['mimetype'], true)); $r[$x]['text'] = $r[$x]['body'];
$r[$x]['rank'] = 0; $r[$x]['rank'] = 0;
if($r[$x]['term']) { if($r[$x]['term']) {
@ -89,16 +67,20 @@ function search_doc_files($s) {
if(stristr($r[$x]['sid'],$s)) if(stristr($r[$x]['sid'],$s))
$r[$x]['rank'] ++; $r[$x]['rank'] ++;
$r[$x]['rank'] += substr_count(strtolower($r[$x]['text']),strtolower($s)); $r[$x]['rank'] += substr_count(strtolower($r[$x]['text']),strtolower($s));
// bias the results to the observer's native language
if($r[$x]['lang'] === $a->language)
$r[$x]['rank'] = $r[$x]['rank'] + 10;
} }
usort($r,'doc_rank_sort'); usort($r,'doc_rank_sort');
return $r; return $r;
} }
function doc_rank_sort($a,$b) { function doc_rank_sort($s1,$s2) {
if($a['rank'] == $b['rank']) if($s1['rank'] == $s2['rank'])
return 0; return 0;
return (($a['rank'] < $b['rank']) ? 1 : (-1)); return (($s1['rank'] < $s2['rank']) ? 1 : (-1));
} }
@ -118,14 +100,17 @@ function store_doc_file($s) {
if(strpos($s,'.md')) if(strpos($s,'.md'))
$item['mimetype'] = 'text/markdown'; $mimetype = 'text/markdown';
elseif(strpos($s,'.html')) elseif(strpos($s,'.html'))
$item['mimetype'] = 'text/html'; $mimetype = 'text/html';
else else
$item['mimetype'] = 'text/bbcode'; $mimetype = 'text/bbcode';
require_once('include/html2plain.php');
$item['body'] = html2plain(prepare_text(file_get_contents($s),$mimetype, true));
$item['mimetype'] = 'text/plain';
$item['body'] = file_get_contents($s);
$item['plink'] = z_root() . '/' . str_replace('doc','help',$s); $item['plink'] = z_root() . '/' . str_replace('doc','help',$s);
$item['owner_xchan'] = $item['author_xchan'] = $sys['channel_hash']; $item['owner_xchan'] = $item['author_xchan'] = $sys['channel_hash'];
$item['item_type'] = ITEM_TYPE_DOC; $item['item_type'] = ITEM_TYPE_DOC;

1
mod/siteinfo.php
View File

@ -84,7 +84,6 @@ function siteinfo_init(&$a) {
'register_policy' => $register_policy[$a->config['system']['register_policy']], 'register_policy' => $register_policy[$a->config['system']['register_policy']],
'directory_mode' => $directory_mode[$a->config['system']['directory_mode']], 'directory_mode' => $directory_mode[$a->config['system']['directory_mode']],
'language' => get_config('system','language'), 'language' => get_config('system','language'),
'diaspora_emulation' => get_config('system','diaspora_enabled'),
'rss_connections' => get_config('system','feed_contacts'), 'rss_connections' => get_config('system','feed_contacts'),
'expiration' => $site_expire, 'expiration' => $site_expire,
'default_service_restrictions' => $service_class, 'default_service_restrictions' => $service_class,