- added support for fulltext index

op/op.Search.php

@@ -2,6 +2,7 @@
 //    MyDMS. Document Management System
 //    Copyright (C) 2002-2005  Markus Westphal
 //    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2011 Uwe Steinmann
 //
 //    This program is free software; you can redistribute it and/or modify
 //    it under the terms of the GNU General Public License as published by
@@ -26,14 +27,20 @@ include("../inc/inc.Authentication.php");
 
 // Redirect to the search page if the navigation search button has been
 // selected without supplying any search terms.
-if (isset($_GET["navBar"]) && strlen($_GET["query"])==0) {
+if (isset($_GET["navBar"])) {
 	if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 		$folderid=$settings->_rootFolderID;
 	}
 	else {
 		$folderid = $_GET["folderid"];
 	}
-	header("Location: ../out/out.SearchForm.php?folderid=".$folderid);
+	if(strlen($_GET["query"])==0) {
+		header("Location: ../out/out.SearchForm.php?folderid=".$folderid);
+	} else {
+		if($_GET["fullsearch"]) {
+			header("Location: ../op/op.SearchFulltext.php?folderid=".$folderid."&query=".$_GET["query"]);
+		}
+	}
 }
 
 //
@@ -203,6 +210,15 @@ if (isset($_GET["obsolete"])){
 if (isset($_GET["expired"])){
 	$status[] = S_EXPIRED;
 }
+
+// category
+$categories = array();
+if(isset($_GET['categoryids']) && $_GET['categoryids']) {
+	foreach($_GET['categoryids'] as $catid) {
+		$categories[] = $dms->getDocumentCategory($catid);
+	}
+}
+
 //
 // Get the page number to display. If the result set contains more than
 // 25 entries, it is displayed across multiple pages.
@@ -224,7 +240,7 @@ if (isset($_GET["pg"])) {
 
 // ------------------------------------- Suche starten --------------------------------------------
 $startTime = getTime();
-$resArr = $dms->search($query, 25, ($pageNumber-1)*25, $mode, $searchin, $startFolder, $owner, $status, $startdate, $stopdate);
+$resArr = $dms->search($query, 25, ($pageNumber-1)*25, $mode, $searchin, $startFolder, $owner, $status, $startdate, $stopdate, $categories);
 $searchTime = getTime() - $startTime;
 $searchTime = round($searchTime, 2);
 // ---------------------------------- Ausgabe der Ergebnisse --------------------------------------

op/op.SearchFulltext.php

@@ -0,0 +1,229 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2011 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+function getTime() {
+	if (function_exists('microtime')) {
+		$tm = microtime();
+		$tm = explode(' ', $tm);
+		return (float) sprintf('%f', $tm[1] + $tm[0]);
+	}
+	return time();
+}
+
+if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
+	$folderid=$settings->_rootFolderID;
+} else {
+	$folderid = $_GET["folderid"];
+}
+
+$folder = $dms->getFolder($folderid);
+if (!is_object($folder)) {
+	UI::exitError(getMLText("search_results"),getMLText("invalid_folder_id"));
+}
+
+// Create the keyword search string. This search spans up to three columns
+// in the database: keywords, name and comment.
+
+if (isset($_GET["query"]) && is_string($_GET["query"])) {
+	$query = sanitizeString($_GET["query"]);
+}
+else {
+	$query = "";
+}
+
+// category
+$categories = array();
+if(isset($_GET['categoryids']) && $_GET['categoryids']) {
+	foreach($_GET['categoryids'] as $catid) {
+		if($catid > 0) {
+			$category = $dms->getDocumentCategory($catid);
+			$categories[] = $category->getName();
+		}
+	}
+}
+
+//
+// Get the page number to display. If the result set contains more than
+// 25 entries, it is displayed across multiple pages.
+//
+// This requires that a page number variable be used to track which page the
+// user is interested in, and an extra clause on the select statement.
+//
+// Default page to display is always one.
+$pageNumber=1;
+if (isset($_GET["pg"])) {
+	if (is_numeric($_GET["pg"]) && $_GET["pg"]>0) {
+		$pageNumber = (integer)$_GET["pg"];
+	}
+	else if (!strcasecmp($_GET["pg"], "all")) {
+		$pageNumber = "all";
+	}
+}
+
+
+// --------------- Suche starten --------------------------------------------
+
+$folderPathHTML = getFolderPathHTML($folder, true);
+UI::htmlStartPage(getMLText("search_results"));
+UI::globalNavigation($folder);
+UI::pageNavigation($folderPathHTML, "", $folder);
+UI::contentHeading(getMLText("search_results"));
+
+// Check to see if the search has been restricted to a particular
+// document owner.
+$owner = null;
+if (isset($_GET["ownerid"]) && is_numeric($_GET["ownerid"]) && $_GET["ownerid"]!=-1) {
+	$owner = $dms->getUser($_GET["ownerid"]);
+	if (!is_object($owner)) {
+		UI::contentContainer(getMLText("unknown_owner"));
+		UI::htmlEndPage();
+		exit;
+	}
+}
+
+$pageNumber=1;
+if (isset($_GET["pg"])) {
+	if (is_numeric($_GET["pg"]) && $_GET["pg"]>0) {
+		$pageNumber = (integer)$_GET["pg"];
+	}
+	else if (!strcasecmp($_GET["pg"], "all")) {
+		$pageNumber = "all";
+	}
+}
+
+$startTime = getTime();
+if($settings->_enableFullSearch) {
+	if(!empty($settings->_luceneDir))
+		require_once($settings->_luceneDir.'/Lucene.php');
+	else
+		require_once('LetoDMS/Lucene.php');
+}
+$index = Zend_Search_Lucene::open($settings->_indexPath);
+$lucenesearch = new LetoDMS_Lucene_Search($index);
+$hits = $lucenesearch->search($query, $owner ? $owner->getLogin() : '', '', $categories);
+$limit = 25;
+$resArr = array();
+if($pageNumber != 'all' && count($hits) > $limit) {
+	$resArr['totalPages'] = (int) (count($hits) / $limit);
+	if ((count($hits)%$limit) > 0)
+		$resArr['totalPages']++;
+	$hits = array_slice($hits, ($pageNumber-1)*$limit, $limit);
+} else {
+	$resArr['totalPages'] = 1;
+}
+
+$resArr['docs'] = array();
+$resArr['totalDocs'] = 0;
+if($hits) {
+	$resArr['totalDocs'] = count($hits);
+	foreach($hits as $hit) {
+		$resArr['docs'][] = $dms->getDocument($hit['document_id']);
+	}
+}
+$searchTime = getTime() - $startTime;
+$searchTime = round($searchTime, 2);
+
+UI::contentContainerStart();
+?>
+<table width="100%" style="border-collapse: collapse;">
+<tr>
+<td align="left" style="padding:0; margin:0;">
+<?php
+$numResults = count($resArr['docs']);
+if ($numResults == 0) {
+	printMLText("search_no_results");
+}
+else {
+	printMLText("search_report", array("count" => $resArr['totalDocs']));
+}
+?>
+</td>
+<td align="right"><?php printMLText("search_time", array("time" => $searchTime));?></td>
+</tr>
+</table>
+
+<?php
+if ($numResults == 0) {
+	UI::contentContainerEnd();
+	UI::htmlEndPage();
+	exit;
+}
+
+UI::pageList($pageNumber, $resArr['totalPages'], "../op/op.SearchFulltext.php", $_GET);
+
+print "<table class=\"folderView\">";
+print "<thead>\n<tr>\n";
+//print "<th></th>\n";
+print "<th>".getMLText("name")."</th>\n";
+print "<th>".getMLText("owner")."</th>\n";
+print "<th>".getMLText("status")."</th>\n";
+print "<th>".getMLText("version")."</th>\n";
+print "<th>".getMLText("comment")."</th>\n";
+//print "<th>".getMLText("reviewers")."</th>\n";
+//print "<th>".getMLText("approvers")."</th>\n";
+print "</tr>\n</thead>\n<tbody>\n";
+
+$resultsFilteredByAccess = false;
+foreach ($resArr['docs'] as $document) {
+	if ($document->getAccessMode($user) < M_READ) {
+		$resultsFilteredByAccess = true;
+	}
+	else {
+		$lc = $document->getLatestContent();
+		print "<tr>";
+		$docName = $document->getName();
+		print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\">/";
+		$folder = $document->getFolder();
+		$path = $folder->getPath();
+		for ($i = 1; $i  < count($path); $i++) {
+			print $path[$i]->getName()."/";
+		}
+		print $docName;
+		print "</a></td>";
+		
+		$owner = $document->getOwner();
+		print "<td>".$owner->getFullName()."</td>";
+		print "<td>".getOverallStatusText($lc->getStatus()). "</td>";
+
+		print "<td class=\"center\">".$lc->getVersion()."</td>";
+		
+		$comment = $document->getComment();
+		if (strlen($comment) > 50) $comment = substr($comment, 0, 47) . "...";
+		print "<td>".$comment."</td>";
+		print "</tr>\n";
+	}
+}
+if ($resultsFilteredByAccess) {
+	print "<tr><td colspan=\"7\">". getMLText("search_results_access_filtered") . "</td></tr>";
+}
+print "</tbody></table>\n";
+
+UI::pageList($pageNumber, $resArr['totalPages'], "../op/op.Search.php", $_GET);
+
+UI::contentContainerEnd();
+UI::htmlEndPage();
+?>

out/out.IndexInfo.php

@@ -0,0 +1,59 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2011 Matteo Lucarelli
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Version.php");
+include("../inc/inc.Settings.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+if (!$user->isAdmin()) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+
+$v = new LetoDMS_Version;
+
+UI::htmlStartPage(getMLText('fulltext_info'));
+UI::globalNavigation();
+UI::pageNavigation(getMLText('fulltext_info'));
+UI::contentContainerStart();
+if($settings->_enableFullSearch) {
+	if(!empty($settings->_luceneDir))
+		require_once($settings->_luceneDir.'/Lucene.php');
+	else
+		require_once('LetoDMS/Lucene.php');
+
+	$index = Zend_Search_Lucene::open($settings->_indexPath);
+
+	$terms = $index->terms();
+	echo "<p>".count($terms)." Terms</p>";
+	echo "<pre>";
+	foreach($terms as $term) {
+		echo $term->field.":".$term->text."\n";
+	}
+	echo "</pre>";
+} else {
+	printMLText("fulltextsearch_disabled");
+}
+UI::contentContainerEnd();
+UI::htmlEndPage();
+?>

out/out.Indexer.php

@@ -0,0 +1,113 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2011 Matteo Lucarelli
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Version.php");
+include("../inc/inc.Settings.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+function tree($folder, $indent='') { /* {{{ */
+	global $index, $dms;
+	echo $indent."D ".$folder->getName()."\n";
+	$subfolders = $folder->getSubFolders();
+	foreach($subfolders as $subfolder) {
+		tree($subfolder, $indent.'  ');
+	}
+	$documents = $folder->getDocuments();
+	foreach($documents as $document) {
+		echo $indent."  ".$document->getId().":".$document->getName()." ";
+		/* If the document wasn't indexed before then just add it */
+		if(!($hits = $index->find('document_id:'.$document->getId()))) {
+			$index->addDocument(new LetoDMS_Lucene_IndexedDocument($dms, $document));
+			echo "(document added)";
+		} else {
+			$hit = $hits[0];
+			$created = (int) $hit->getDocument()->getFieldValue('created');
+			$content = $document->getLatestContent();
+			if($created >= $content->getDate()) {
+				echo $indent."(document unchanged)";
+			} else {
+				if($index->delete($hit->id)) {
+					$index->addDocument(new LetoDMS_Lucene_IndexedDocument($dms, $document));
+				}
+				echo $indent."(document updated)";
+			}
+		}
+		echo "\n";
+	}
+} /* }}} */
+
+if (!$user->isAdmin()) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+
+$v = new LetoDMS_Version;
+
+UI::htmlStartPage($v->banner());
+UI::globalNavigation();
+UI::pageNavigation($v->banner());
+UI::contentContainerStart();
+if($settings->_enableFullSearch) {
+	if(!empty($settings->_luceneDir))
+		require_once($settings->_luceneDir.'/Lucene.php');
+	else
+		require_once('LetoDMS/Lucene.php');
+
+	if(isset($_GET['create']) && $_GET['create'] == 1) {
+		if(isset($_GET['confirm']) && $_GET['confirm'] == 1) {
+			echo "<p>Recreating index</p>";
+			$index = Zend_Search_Lucene::create($settings->_indexPath);
+		} else {
+			echo '<p>'.getMLText('create_fulltext_index_warning').'</p>';
+			echo '<a href="out.Indexer.php?create=1&confirm=1">'.getMLText('confirm_create_fulltext_index').'</a>';
+			UI::contentContainerEnd();
+			UI::htmlEndPage();
+			exit;
+		}
+	} else {
+		echo "<p>Updating index</p>";
+		$index = Zend_Search_Lucene::open($settings->_indexPath);
+	}
+
+	if($settings->_stopWordsFile && file_exists($settings->_stopWordsFile)) {
+		$stopWordsFilter = new Zend_Search_Lucene_Analysis_TokenFilter_StopWords();
+		$stopWordsFilter->loadFromFile($settings->_stopWordsFile);
+	 
+		$analyzer = new Zend_Search_Lucene_Analysis_Analyzer_Common_TextNum_CaseInsensitive();
+		$analyzer->addFilter($stopWordsFilter);
+	 
+		Zend_Search_Lucene_Analysis_Analyzer::setDefault($analyzer);
+	}
+
+	$folder = $dms->getFolder($settings->_rootFolderID);
+	echo "<pre>";
+	tree($folder);
+	echo "</pre>";
+
+	$index->commit();
+} else {
+	printMLText("fulltextsearch_disabled");
+}
+UI::contentContainerEnd();
+UI::htmlEndPage();
+?>