Peter M. Groen / knowledgetree

Commit 4bcd22b06152d6020221bb83d1a7612b6b263bcb

Authored by conradverm
1 parent 01b32c9b

KTS-673 

"The search algorithm needs some work"
Updated. Cleaning up search2 functionality

Committed By: Conrad Vermeulen
Reviewed By: Kevin Fourie

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7258 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 5 additions and 52 deletions
search2.php
  View file @4bcd22b
@@ -62,7 +62,7 @@ class SearchDispatcher extends KTStandardDispatcher { @@ -62,7 +62,7 @@ class SearchDispatcher extends KTStandardDispatcher {
62 } 62 }
63 catch(Exception $e) 63 catch(Exception $e)
64 { 64 {
65 - $this->errorRedirectTo('guiBuilder', _kt('Could not process query.' . $e->getMessage())); 65 + $this->errorRedirectTo('guiBuilder', _kt('Could not process query.') . $e->getMessage());
66 } 66 }
67 } 67 }
68 68
@@ -156,26 +156,20 @@ class SearchDispatcher extends KTStandardDispatcher { @@ -156,26 +156,20 @@ class SearchDispatcher extends KTStandardDispatcher {
156 $config = KTConfig::getSingleton(); 156 $config = KTConfig::getSingleton();
157 $resultsPerPage = ($showall)?$numRecs:$config->get('search/resultsPerPage', SearchDispatcher::RESULTS_PER_PAGE); 157 $resultsPerPage = ($showall)?$numRecs:$config->get('search/resultsPerPage', SearchDispatcher::RESULTS_PER_PAGE);
158 158
159 -  
160 -  
161 $maxPageMove = SearchDispatcher::MAX_PAGE_MOVEMENT; 159 $maxPageMove = SearchDispatcher::MAX_PAGE_MOVEMENT;
162 160
163 -  
164 -  
165 $pageOffset = 1; 161 $pageOffset = 1;
166 if (isset($_GET['pageOffset'])) 162 if (isset($_GET['pageOffset']))
167 { 163 {
168 $pageOffset = $_GET['pageOffset']; 164 $pageOffset = $_GET['pageOffset'];
169 } 165 }
170 166
171 -  
172 $maxPages = ceil($numRecs / $resultsPerPage) ; 167 $maxPages = ceil($numRecs / $resultsPerPage) ;
173 if ($pageOffset <= 0 || $pageOffset > $maxPages) 168 if ($pageOffset <= 0 || $pageOffset > $maxPages)
174 { 169 {
175 $pageOffset = 1; 170 $pageOffset = 1;
176 } 171 }
177 172
178 -  
179 $firstRec = ($pageOffset-1) * $resultsPerPage; 173 $firstRec = ($pageOffset-1) * $resultsPerPage;
180 $lastRec = $firstRec + $resultsPerPage; 174 $lastRec = $firstRec + $resultsPerPage;
181 if ($lastRec > $numRecs) 175 if ($lastRec > $numRecs)
@@ -185,8 +179,6 @@ class SearchDispatcher extends KTStandardDispatcher { @@ -185,8 +179,6 @@ class SearchDispatcher extends KTStandardDispatcher {
185 179
186 $display = array_slice($results,$firstRec ,$resultsPerPage); 180 $display = array_slice($results,$firstRec ,$resultsPerPage);
187 181
188 -  
189 -  
190 $startOffset = $pageOffset - $maxPageMove; 182 $startOffset = $pageOffset - $maxPageMove;
191 if ($startOffset < 1) 183 if ($startOffset < 1)
192 { 184 {
@@ -198,17 +190,12 @@ class SearchDispatcher extends KTStandardDispatcher { @@ -198,17 +190,12 @@ class SearchDispatcher extends KTStandardDispatcher {
198 $endOffset = $maxPages; 190 $endOffset = $maxPages;
199 } 191 }
200 192
201 -  
202 -  
203 $pageMovement = array(); 193 $pageMovement = array();
204 for($i=$startOffset;$i<=$endOffset;$i++) 194 for($i=$startOffset;$i<=$endOffset;$i++)
205 { 195 {
206 $pageMovement[] = $i; 196 $pageMovement[] = $i;
207 } 197 }
208 198
209 -  
210 -  
211 -  
212 $aBulkActions = KTBulkActionUtil::getAllBulkActions(); 199 $aBulkActions = KTBulkActionUtil::getAllBulkActions();
213 200
214 $aTemplateData = array( 201 $aTemplateData = array(
@@ -316,8 +303,8 @@ class SearchDispatcher extends KTStandardDispatcher { @@ -316,8 +303,8 @@ class SearchDispatcher extends KTStandardDispatcher {
316 303
317 function do_guiBuilder() 304 function do_guiBuilder()
318 { 305 {
319 - $this->oPage->setBreadcrumbDetails(_kt("Query Builder"));  
320 - $this->oPage->title = _kt("Query Builder"); 306 + $this->oPage->setBreadcrumbDetails(_kt("Advanced Search"));
  307 + $this->oPage->title = _kt("Advanced Search");
321 308
322 $result = array(); 309 $result = array();
323 310
@@ -348,8 +335,8 @@ class SearchDispatcher extends KTStandardDispatcher { @@ -348,8 +335,8 @@ class SearchDispatcher extends KTStandardDispatcher {
348 335
349 function do_queryBuilder() 336 function do_queryBuilder()
350 { 337 {
351 - $this->oPage->setBreadcrumbDetails(_kt("Advanced Query Builder"));  
352 - $this->oPage->title = _kt("Advanced Query Builder"); 338 + $this->oPage->setBreadcrumbDetails(_kt("Query Editor"));
  339 + $this->oPage->title = _kt("Query Editor");
353 $oTemplating =& KTTemplating::getSingleton(); 340 $oTemplating =& KTTemplating::getSingleton();
354 $oTemplate = $oTemplating->loadTemplate("ktcore/search2/adv_query_search"); 341 $oTemplate = $oTemplating->loadTemplate("ktcore/search2/adv_query_search");
355 342
@@ -380,40 +367,6 @@ class SearchDispatcher extends KTStandardDispatcher { @@ -380,40 +367,6 @@ class SearchDispatcher extends KTStandardDispatcher {
380 ); 367 );
381 return $oTemplate->render($aTemplateData); 368 return $oTemplate->render($aTemplateData);
382 } 369 }
383 -  
384 - function do_metadata()  
385 - {  
386 - $this->oPage->setBreadcrumbDetails(_kt("Metadata Query Builder"));  
387 - $this->oPage->title = _kt("Metadata Query Builder");  
388 -  
389 - $result = array();  
390 -  
391 - $result['fieldsets'] = SearchHelper::getFieldsets();  
392 - $result['fieldset_str'] = SearchHelper::getJSfieldsetStruct($result['fieldsets']);  
393 -  
394 - $result['users_str'] = SearchHelper::getJSusersStruct();  
395 -  
396 - $oTemplating =& KTTemplating::getSingleton();  
397 - $oTemplate = $oTemplating->loadTemplate("ktcore/search2/metadata_search");  
398 - $aTemplateData = array(  
399 - "context" => $this,  
400 - 'metainfo'=> $result  
401 - );  
402 - return $oTemplate->render($aTemplateData);  
403 - }  
404 -  
405 - function do_tree()  
406 - {  
407 - $this->oPage->setBreadcrumbDetails(_kt("Tree Browser"));  
408 - $this->oPage->title = _kt("Tree Browser");  
409 -  
410 - $oTemplating =& KTTemplating::getSingleton();  
411 - $oTemplate = $oTemplating->loadTemplate("ktcore/search2/tree");  
412 - $aTemplateData = array(  
413 - "context" => $this  
414 - );  
415 - return $oTemplate->render($aTemplateData);  
416 - }  
417 } 370 }
418 371
419 372