neopolimatrix search fix

This commit is contained in:
Naeltard 2015-01-26 23:26:56 +01:00
parent 7b66bd2f6f
commit acc8e7d971
7 changed files with 15 additions and 8 deletions

View File

@ -5,7 +5,7 @@ class elements {
return \DBD\NEOPOLIMATRIX_GENERATE_ELEMENTLIST::QA(array($tag));}
public static function getAllElementsOfSearch($search){
return \DBD\NEOPOLIMATRIX_GENERATE_ELEMENTLIST_FULLTEXT_SEARCH::QA(array($search));}
return \DBD\NEOPOLIMATRIX_GENERATE_ELEMENTLIST_FULLTEXT_SEARCH::QA(array($search,$search));}
public static function getText($tag){
return \DBD\NEOPOLIMATRIX_GET_TEXT::Q1(array($tag));}

View File

@ -7,5 +7,7 @@ class NEOPOLIMATRIX_GENERATE_ELEMENTLIST_FULLTEXT_SEARCH extends \SYSTEM\DB\QP {
//pg
'',
//mys
'SELECT * FROM system_locale_string WHERE deDE like "%?%";'
'SELECT * FROM system_locale_string'.
' LEFT JOIN system_locale_string_tag_strings ON (system_locale_string.id = system_locale_string_tag_strings.id)'.
' WHERE deDE like ? OR system_locale_string.id like ?;'
);}}

View File

@ -23,6 +23,10 @@ class default_list extends \SYSTEM\PAGE\Page {
return '%polizei%';
case 6:
return '%demokratie%';
case 7:
return '%fof%';
case 8:
return '%start%';
default:
return '%';}

View File

@ -1,5 +1,5 @@
$(document).ready(function() {
new SYSTEM('./api.php',1,'start;filter.1');
new SYSTEM('./api.php',1,'start;filter.8');
tabs();
impressum();
search();
@ -15,7 +15,7 @@ function impressum(){
function search(){
$("#nav_search_btn").click(function(){
alert($('#nav_search').val());
$('#contentframe').load('./?page=search&param="%' + $('#nav_search').val() + '%"');
$('#contentframe').load('./?page=search&param='+$('#nav_search').val());
});
}

View File

@ -41,6 +41,7 @@
<p style="padding-top: 10px; font-size: 13pt; margin-right: 30px; margin-left: 7px; float: left;">Nach Themen</p>
<ul class="nav nav-tabs" id="tabs_user_list">
<li class="active"><a href="#start;filter.1" filter="1">Neu</a></li>
<li><a href="#start;filter.7" filter="7">Serie: FoF</a></li>
<li><a href="#start;filter.6" filter="6">Demokratie</a></li>
<li><a href="#start;filter.2" filter="2">Überwachung</a></li>
<li><a href="#start;filter.3" filter="3">Ungleichheit</a></li>
@ -52,7 +53,8 @@
</ul>
</div>
<div id="contentframe" style="margin: auto;">
<div id="contentframe" style="margin: auto;">
test
</div>
<div id="bottombar" style="width: 100%; min-height: 30px; background: black; position: relative; bottom: 0;">
</div>

View File

@ -31,9 +31,7 @@ class default_search extends \SYSTEM\PAGE\Page {
}
public function generate_list(){
$result = '';
$tag = $this->param;
new SYSTEM\LOG\INFO($tag);
$elements = elements::getAllElementsOfSearch($tag);
$elements = elements::getAllElementsOfSearch('%'.$this->param.'%');
foreach($elements as $element){
$element['title'] = $element['id'];
$element['published'] = date_format(new DateTime($element['timestamp']), 'H:i d-m-Y');

View File

@ -10,6 +10,7 @@ class page_neopolimatrix extends \SYSTEM\API\api_default {
return new default_article($id);}
public static function page_search($param){
new SYSTEM\LOG\INFO($param);
return new default_search($param);}
public static function page_impressum(){