is_valid_index() and isadmin()) {
+ if (!$sq->is_valid_index() and has_capability('moodle/site:doanything', get_context_instance(CONTEXT_SYSTEM))) {
print '
"; - print $hit_count.' '.get_string('resultsreturnedfor', 'search') . " '".stripslashes($query_string)."'."; + print $hit_count.' '.get_string('resultsreturnedfor', 'search') . " '".s($query_string)."'."; print "
"; if ($hit_count > 0) { @@ -324,30 +335,53 @@ $typestr = get_string('type', 'search'); $scorestr = get_string('score', 'search'); $authorstr = get_string('author', 'search'); - foreach ($hits as $listing) { + + $searchables = search_collect_searchables(false, false); + + foreach ($hits as $listing) { + + if ($listing->doctype == 'user'){ // A special handle for users + + $icon = print_user_picture ($listing->author, 0, true, 0, true, false) ; + } else { + $iconpath = $CFG->modpixpath.'/'.$listing->doctype.'/icon.gif'; + $icon = "![\"\"/](\"".$iconpath."\")
";
+ }
+ $coursename = get_field('course', 'fullname', 'id', $listing->courseid);
+ $courseword = mb_convert_case(get_string('course', 'moodle'), MB_CASE_LOWER, 'UTF-8');
+ $course = ($listing->doctype != 'user') ? ' ('.$courseword.': \''.$coursename.'\')' : '' ;
+
//if ($CFG->unicodedb) {
//$listing->title = mb_convert_encoding($listing->title, 'auto', 'UTF8');
//}
$title_post_processing_function = $listing->doctype.'_link_post_processing';
- require_once "{$CFG->dirroot}/search/documents/{$listing->doctype}_document.php";
+ $searchable_instance = $searchables[$listing->doctype];
+ if ($searchable_instance->location == 'internal'){
+ require_once "{$CFG->dirroot}/search/documents/{$listing->doctype}_document.php";
+ } else {
+ require_once "{$CFG->dirroot}/{$searchable_instance->location}/{$listing->doctype}/search_document.php";
+ }
if (function_exists($title_post_processing_function)) {
$listing->title = $title_post_processing_function($listing->title);
}
- print "url)."'>$listing->title
\n" - ."".search_shorten_url($listing->url, 70)."
\n" - ."{$typestr}: ".$listing->doctype.", {$scorestr}: ".round($listing->score, 3); - if (!empty($listing->author)){ - print ", {$authorstr}: ".$listing->author."\n" + echo " url)
+ ."'>$icon $listing->title $course
\n"; + // print " url)."'>$listing->title
\n" + // ."".search_shorten_url($listing->url, 70)."
\n" + echo "{$typestr}: " . $listing->doctype . ", {$scorestr}: " . round($listing->score, 3); + if (!empty($listing->author) && !is_numeric($listing->author)){ + echo ", {$authorstr}: ".$listing->author."\n" ." \n";
}
}
- print "";
- print $page_links;
+ echo "";
+ echo $page_links;
}
print_box_end();
?>
-
' . get_string('noindexmessage', 'search') . '' . get_string('createanindex', 'search')."
\n"; } @@ -296,7 +306,8 @@ is_valid()) { print_box_start(); @@ -305,7 +316,7 @@ print ""; - print $hit_count.' '.get_string('resultsreturnedfor', 'search') . " '".stripslashes($query_string)."'."; + print $hit_count.' '.get_string('resultsreturnedfor', 'search') . " '".s($query_string)."'."; print "
"; if ($hit_count > 0) { @@ -324,30 +335,53 @@ $typestr = get_string('type', 'search'); $scorestr = get_string('score', 'search'); $authorstr = get_string('author', 'search'); - foreach ($hits as $listing) { + + $searchables = search_collect_searchables(false, false); + + foreach ($hits as $listing) { + + if ($listing->doctype == 'user'){ // A special handle for users + + $icon = print_user_picture ($listing->author, 0, true, 0, true, false) ; + } else { + $iconpath = $CFG->modpixpath.'/'.$listing->doctype.'/icon.gif'; + $icon = "
\n" - ."".search_shorten_url($listing->url, 70)."
\n" - ."{$typestr}: ".$listing->doctype.", {$scorestr}: ".round($listing->score, 3); - if (!empty($listing->author)){ - print ", {$authorstr}: ".$listing->author."\n" + echo "
\n"; + // print "
\n" + // ."".search_shorten_url($listing->url, 70)."
\n" + echo "{$typestr}: " . $listing->doctype . ", {$scorestr}: " . round($listing->score, 3); + if (!empty($listing->author) && !is_numeric($listing->author)){ + echo ", {$authorstr}: ".$listing->author."\n" ."
+
+?>
\ No newline at end of file
diff --git a/search/querylib.php b/search/querylib.php
index ac83694fc33..84a3eaa43d7 100644
--- a/search/querylib.php
+++ b/search/querylib.php
@@ -26,7 +26,8 @@ public $url,
$doctype,
$author,
$score,
- $number;
+ $number,
+ $courseid;
}
@@ -67,17 +68,17 @@ private $mode,
$last_term = $this->fetch('search_last_term');
//if this query is different from the last, clear out the last one
- if ($id != false and $last_term != $id) {
+ if ($id != false && $last_term != $id) {
$this->clear($last_term);
}
//store the new query if id and object are passed in
- if ($object and $id) {
+ if ($object && $id) {
$this->store('search_last_term', $id);
$this->store($id, $object);
return true;
//otherwise return the stored results
- } else if ($id and $this->exists($id)) {
+ } else if ($id && $this->exists($id)) {
return $this->fetch($id);
}
}
@@ -219,13 +220,17 @@ class SearchQuery {
private function process_results($all=false) {
global $USER;
- $term = mb_convert_case($this->term, MB_CASE_LOWER, 'UTF-8');
-
+ // $term = mb_convert_case($this->term, MB_CASE_LOWER, 'UTF-8');
+ $term = $this->term;
+ $page = optional_param('page', 1, PARAM_INT);
+
//experimental - return more results
- $strip_arr = array('author:', 'title:', '+', '-', 'doctype:');
- $stripped_term = str_replace($strip_arr, '', $term);
+ // $strip_arr = array('author:', 'title:', '+', '-', 'doctype:');
+ // $stripped_term = str_replace($strip_arr, '', $term);
- $hits = $this->index->find($term." title:".$stripped_term." author:".$stripped_term);
+ // $search_string = $term." title:".$stripped_term." author:".$stripped_term;
+ $search_string = $term;
+ $hits = $this->index->find($search_string);
//--
$hitcount = count($hits);
@@ -233,49 +238,58 @@ class SearchQuery {
if ($hitcount == 0) return array();
- $totalpages = ceil($hitcount/$this->results_per_page);
+ $resultdoc = new SearchResult();
+ $resultdocs = array();
+ $searchables = search_collect_searchables(false, false);
+ $realindex = 0;
+
+ /**
if (!$all) {
- if ($hitcount < $this->results_per_page) {
+ if ($finalresults < $this->results_per_page) {
$this->pagenumber = 1;
- } else if ($this->pagenumber > $totalpages) {
+ } elseif ($this->pagenumber > $totalpages) {
$this->pagenumber = $totalpages;
}
$start = ($this->pagenumber - 1) * $this->results_per_page;
$end = $start + $this->results_per_page;
- if ($end > $hitcount) {
- $end = $hitcount;
+ if ($end > $finalresults) {
+ $end = $finalresults;
}
} else {
$start = 0;
- $end = $hitcount;
- }
+ $end = $finalresults;
+ } */
- $resultdoc = new SearchResult();
- $resultdocs = array();
-
- for ($i = $start; $i < $end; $i++) {
+ for ($i = 0; $i < min($hitcount, ($page) * $this->results_per_page); $i++) {
$hit = $hits[$i];
//check permissions on each result
- if ($this->can_display($USER, $hit->docid, $hit->doctype, $hit->course_id, $hit->group_id, $hit->path, $hit->itemtype, $hit->context_id )) {
- $resultdoc->number = $i;
- $resultdoc->url = $hit->url;
- $resultdoc->title = $hit->title;
- $resultdoc->score = $hit->score;
- $resultdoc->doctype = $hit->doctype;
- $resultdoc->author = $hit->author;
-
- //and store it
- $resultdocs[] = clone($resultdoc);
+ if ($this->can_display($USER, $hit->docid, $hit->doctype, $hit->course_id, $hit->group_id, $hit->path, $hit->itemtype, $hit->context_id, $searchables )) {
+ if ($i >= ($page - 1) * $this->results_per_page){
+ $resultdoc->number = $realindex;
+ $resultdoc->url = $hit->url;
+ $resultdoc->title = $hit->title;
+ $resultdoc->score = $hit->score;
+ $resultdoc->doctype = $hit->doctype;
+ $resultdoc->author = $hit->author;
+ $resultdoc->courseid = $hit->course_id;
+
+ //and store it
+ $resultdocs[] = clone($resultdoc);
+ }
+ $realindex++;
} else {
// lowers total_results one unit
$this->total_results--;
}
}
+ $totalpages = ceil($this->total_results/$this->results_per_page);
+
+
return $resultdocs;
}
@@ -286,7 +300,7 @@ class SearchQuery {
private function get_results() {
$cache = new SearchCache();
- if ($this->cache and $cache->can_cache()) {
+ if ($this->cache && $cache->can_cache()) {
if (!($resultdocs = $cache->cache($this->term))) {
$resultdocs = $this->process_results();
//cache the results so we don't have to compute this on every page-load
@@ -298,7 +312,7 @@ class SearchQuery {
}
} else {
//no caching :(
- //print "Caching disabled!";
+ // print "Caching disabled!";
$resultdocs = $this->process_results();
}
return $resultdocs;
@@ -315,7 +329,7 @@ class SearchQuery {
$next = get_string('next', 'search');
$back = get_string('back', 'search');
- $ret = "
";
+ $ret = "
";
//Back is disabled if we're on page 1
if ($page > 1) {
@@ -370,56 +384,61 @@ class SearchQuery {
* @uses CFG
* // TODO reorder parameters more consistently
*/
- private function can_display(&$user, $this_id, $doctype, $course_id, $group_id, $path, $item_type, $context_id) {
+ private function can_display(&$user, $this_id, $doctype, $course_id, $group_id, $path, $item_type, $context_id, &$searchables) {
global $CFG;
/**
* course related checks
*/
// admins can see everything, anyway.
- if (isadmin()){
+ if (has_capability('moodle/site:doanything', get_context_instance(CONTEXT_SYSTEM))){
return true;
}
- // first check course compatibility against user : enrolled users to that course can see.
- $myCourses = get_my_courses($user->id);
- $unenroled = !in_array($course_id, array_keys($myCourses));
-
- // if guests are allowed, logged guest can see
- $isallowedguest = (isguest()) ? get_field('course', 'guest', 'id', $course_id) : false ;
-
- if ($unenroled && !$isallowedguest){
- return false;
- }
-
- // if user is enrolled or is allowed user and course is hidden, can he see it ?
- $visibility = get_field('course', 'visible', 'id', $course_id);
- if ($visibility <= 0){
- if (!has_capability('moodle/course:viewhiddencourses', get_context_instance(CONTEXT_COURSE, $course_id))){
- return false;
- }
- }
-
- /**
- * prerecorded capabilities
- */
- // get context caching information and tries to discard unwanted records here
-
-
- /**
- * final checks
- */
- // then give back indexing data to the module for local check
- include_once "{$CFG->dirroot}/search/documents/{$doctype}_document.php";
- $access_check_function = "{$doctype}_check_text_access";
-
- if (function_exists($access_check_function)){
- $modulecheck = $access_check_function($path, $item_type, $this_id, $user, $group_id, $context_id);
- // echo "module said $modulecheck for item $doctype/$item_type/$this_id";
- return($modulecheck);
- }
+ // first check course compatibility against user : enrolled users to that course can see.
+ $myCourses = get_my_courses($user->id);
+ $unenroled = !in_array($course_id, array_keys($myCourses));
- return true;
+ // if guests are allowed, logged guest can see
+ $isallowedguest = (isguest()) ? get_field('course', 'guest', 'id', $course_id) : false ;
+
+ if ($unenroled && !$isallowedguest){
+ return false;
+ }
+
+ // if user is enrolled or is allowed user and course is hidden, can he see it ?
+ $visibility = get_field('course', 'visible', 'id', $course_id);
+ if ($visibility <= 0){
+ if (!has_capability('moodle/course:viewhiddencourses', get_context_instance(CONTEXT_COURSE, $course_id))){
+ return false;
+ }
+ }
+
+ /**
+ * prerecorded capabilities
+ */
+ // get context caching information and tries to discard unwanted records here
+
+
+ /**
+ * final checks
+ */
+ // then give back indexing data to the module for local check
+ $searchable_instance = $searchables[$doctype];
+ if ($searchable_instance->location == 'internal'){
+ include_once "{$CFG->dirroot}/search/documents/{$doctype}_document.php";
+ } else {
+ include_once "{$CFG->dirroot}/{$searchable_instance->location}/$doctype/search_document.php";
+ }
+ $access_check_function = "{$doctype}_check_text_access";
+
+ if (function_exists($access_check_function)){
+ $modulecheck = $access_check_function($path, $item_type, $this_id, $user, $group_id, $context_id);
+ // echo "module said $modulecheck for item $doctype/$item_type/$this_id";
+ return($modulecheck);
+ }
+
+ return true;
}
/**
@@ -471,4 +490,4 @@ class SearchQuery {
return $this->results_per_page;
}
}
-?>
+?>
\ No newline at end of file
diff --git a/search/searchtypes.php b/search/searchtypes.php
new file mode 100644
index 00000000000..308c89d558c
--- /dev/null
+++ b/search/searchtypes.php
@@ -0,0 +1,34 @@
+ 1.8
+* @date 2008/03/31
+* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+*
+* Searcheable types
+* to disable a type, just comment the two declaration lines for that type
+*
+*/
+
+//document types that can be searched
+//define('SEARCH_TYPE_NONE', 'none');
+define('SEARCH_TYPE_WIKI', 'wiki');
+define('SEARCH_TYPE_FORUM', 'forum');
+define('SEARCH_TYPE_GLOSSARY', 'glossary');
+define('SEARCH_TYPE_RESOURCE', 'resource');
+define('SEARCH_TYPE_DATA', 'data');
+define('SEARCH_TYPE_CHAT', 'chat');
+define('SEARCH_TYPE_LESSON', 'lesson');
+define('SEARCH_TYPE_ASSIGNMENT', 'assignment');
+define('SEARCH_TYPE_LABEL', 'label');
+
+define('SEARCH_EXTRAS', 'user');
+define('SEARCH_TYPE_USER', 'user');
+define('PATH_FOR_SEARCH_TYPE_USER', 'user');
+
+?>
\ No newline at end of file
diff --git a/search/stats.php b/search/stats.php
index 8412241ef27..84e4d12429d 100644
--- a/search/stats.php
+++ b/search/stats.php
@@ -32,11 +32,9 @@ require_once("{$CFG->dirroot}/search/lib.php");
/// check for php5, but don't die yet
- if ($check = search_check_php5()) {
- require_once("{$CFG->dirroot}/search/indexlib.php");
+ require_once("{$CFG->dirroot}/search/indexlib.php");
- $indexinfo = new IndexInfo();
- }
+ $indexinfo = new IndexInfo();
if (!$site = get_site()) {
redirect("index.php");
@@ -58,12 +56,6 @@ require_once("{$CFG->dirroot}/search/lib.php");
/// keep things pretty, even if php5 isn't available
- if (!$check) {
- print_heading(search_check_php5(true));
- print_footer();
- exit(0);
- }
-
print_box_start();
print_heading($strquery);
@@ -77,7 +69,7 @@ require_once("{$CFG->dirroot}/search/lib.php");
/// this table is only for admins, shows index directory size and location
- if (isadmin()) {
+ if (has_capability('moodle/site:doanything', get_context_instance(CONTEXT_SYSTEM))) {
$datadirectorystr = get_string('datadirectory', 'search');
$inindexdirectorystr = get_string('filesinindexdirectory', 'search');
$totalsizestr = get_string('totalsize', 'search');
@@ -147,7 +139,7 @@ require_once("{$CFG->dirroot}/search/lib.php");
/// add extra fields if we're admin
- if (isadmin()) {
+ if (has_capability('moodle/site:doanything', get_context_instance(CONTEXT_SYSTEM))) {
//don't want to confuse users if the two totals don't match (hint: they should)
$table->data[] = array($documentsinindexstr, $indexinfo->indexcount);
diff --git a/search/update.php b/search/update.php
index 610735dcc64..b6e458e00aa 100644
--- a/search/update.php
+++ b/search/update.php
@@ -1,25 +1,31 @@
1.8
-* @date 2008/03/31
-* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
-*
-* Index asynchronous updator
-*
-* Major chages in this review is passing the xxxx_db_names return to
-* multiple arity to handle multiple document types modules
-*/
+ /**
+ * Global Search Engine for Moodle
+ *
+ * @package search
+ * @category core
+ * @subpackage search_engine
+ * @author Michael Champanis (mchampan) [cynnical@gmail.com], Valery Fremaux [valery.fremaux@club-internet.fr] > 1.8
+ * @date 2008/03/31
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ *
+ * Index asynchronous updator
+ *
+ * Major chages in this review is passing the xxxx_db_names return to
+ * multiple arity to handle multiple document types modules
+ */
+
+ /**
+ * includes and requires
+ */
+ require_once('../config.php');
-/**
-* includes and requires
-*/
-require_once('../config.php');
-require_once("$CFG->dirroot/search/lib.php");
+/// makes inclusions of the Zend Engine more reliable
+ $separator = (array_key_exists('WINDIR', $_SERVER)) ? ';' : ':' ;
+ ini_set('include_path', $CFG->dirroot.'/search'.$separator.ini_get('include_path'));require_login();
+
+ require_once("$CFG->dirroot/search/lib.php");
+ require_once("$CFG->dirroot/search/indexlib.php");
/// checks global search activation
@@ -29,24 +35,19 @@ require_once("$CFG->dirroot/search/lib.php");
error(get_string('globalsearchdisabled', 'search'));
}
- if (!isadmin()) {
+ if (!has_capability('moodle/site:doanything', get_context_instance(CONTEXT_SYSTEM))) {
error(get_string('beadmin', 'search'), "$CFG->wwwroot/login/index.php");
}
-/// check for php5 (lib.php)
-
- if (!search_check_php5()) {
- $phpversion = phpversion();
- mtrace("Sorry, global search requires PHP 5.0.0 or later (currently using version ".phpversion().")");
- exit(0);
- }
-
- require_once("$CFG->dirroot/search/indexlib.php");
-
- $index = new Zend_Search_Lucene(SEARCH_INDEX_PATH);
+ try {
+ $index = new Zend_Search_Lucene(SEARCH_INDEX_PATH);
+ } catch(LuceneException $e) {
+ mtrace("Could not construct a valid index. Maybe the first indexation was never made, or files might be corrupted. Run complete indexation again.");
+ return;
+ }
$dbcontrol = new IndexDBControl();
$update_count = 0;
- $indexdate = $CFG->search_indexer_update_date;
+ $indexdate = @$CFG->search_indexer_update_date;
$startupdatedate = time();
/// indexing changed resources
@@ -73,7 +74,7 @@ require_once("$CFG->dirroot/search/lib.php");
if ($valuesArray){
foreach($valuesArray as $values){
- $where = (isset($values[5])) ? 'AND ('.$values[5].')' : '';
+ $where = (!empty($values[5])) ? 'AND ('.$values[5].')' : '';
$itemtypes = ($values[4] != '*' && $values[4] != 'any') ? " AND itemtype = '{$values[4]}' " : '' ;
//TODO: check 'in' syntax with other RDBMS' (add and update.php as well)
@@ -85,10 +86,10 @@ require_once("$CFG->dirroot/search/lib.php");
FROM
{$CFG->prefix}{$table}
WHERE
- doctype = '{$mod->name}'
+ doctype = '{$values[1]}'
$itemtypes
";
- $docIds = get_records_sql_menu($query);
+ $docIds = get_records_sql_menu($query, array($mod->name));
$docIdList = ($docIds) ? implode("','", array_keys($docIds)) : '' ;
$query = "