no need to count folders and documents anymore

This commit is contained in:
Uwe Steinmann 2015-08-19 20:15:45 +02:00
parent 58d8d8dd9e
commit c4e80969ea

View File

@ -418,9 +418,10 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
<?php <?php
echo "</div>\n"; echo "</div>\n";
echo "<div class=\"span8\">\n"; echo "<div class=\"span8\">\n";
// Database search Result {{{ // Search Result {{{
$foldercount = $doccount = 0; $foldercount = $doccount = 0;
if($entries) { if($entries) {
/*
foreach ($entries as $entry) { foreach ($entries as $entry) {
if(get_class($entry) == 'SeedDMS_Core_Document') { if(get_class($entry) == 'SeedDMS_Core_Document') {
$doccount++; $doccount++;
@ -428,6 +429,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
$foldercount++; $foldercount++;
} }
} }
*/
print "<div class=\"alert\">".getMLText("search_report", array("doccount" => $totaldocs, "foldercount" => $totalfolders, 'searchtime'=>$searchTime))."</div>"; print "<div class=\"alert\">".getMLText("search_report", array("doccount" => $totaldocs, "foldercount" => $totalfolders, 'searchtime'=>$searchTime))."</div>";
$this->pageList($pageNumber, $totalpages, "../op/op.Search.php", $urlparams); $this->pageList($pageNumber, $totalpages, "../op/op.Search.php", $urlparams);
// $this->contentContainerStart(); // $this->contentContainerStart();
@ -602,7 +604,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
// $this->contentContainerEnd(); // $this->contentContainerEnd();
$this->pageList($pageNumber, $totalpages, "../op/op.Search.php", $_GET); $this->pageList($pageNumber, $totalpages, "../op/op.Search.php", $_GET);
} else { } else {
$numResults = $doccount + $foldercount; $numResults = $totaldocs + $totalfolders;
if ($numResults == 0) { if ($numResults == 0) {
print "<div class=\"alert alert-error\">".getMLText("search_no_results")."</div>"; print "<div class=\"alert alert-error\">".getMLText("search_no_results")."</div>";
} }