diff --git a/neopolimatrix/api/elements/elements.php b/neopolimatrix/api/elements/elements.php index 362611b..49f19b8 100644 --- a/neopolimatrix/api/elements/elements.php +++ b/neopolimatrix/api/elements/elements.php @@ -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));} diff --git a/neopolimatrix/dbd/qq/NEOPOLIMATRIX_GENERATE_ELEMENTLIST_FULLTEXT_SEARCH.php b/neopolimatrix/dbd/qq/NEOPOLIMATRIX_GENERATE_ELEMENTLIST_FULLTEXT_SEARCH.php index 605b58c..b2c36d9 100644 --- a/neopolimatrix/dbd/qq/NEOPOLIMATRIX_GENERATE_ELEMENTLIST_FULLTEXT_SEARCH.php +++ b/neopolimatrix/dbd/qq/NEOPOLIMATRIX_GENERATE_ELEMENTLIST_FULLTEXT_SEARCH.php @@ -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 ?;' );}} \ No newline at end of file diff --git a/neopolimatrix/page/default_list/default_list.php b/neopolimatrix/page/default_list/default_list.php index 1aa3692..8acf870 100644 --- a/neopolimatrix/page/default_list/default_list.php +++ b/neopolimatrix/page/default_list/default_list.php @@ -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 '%';} diff --git a/neopolimatrix/page/default_page/js/default_page.js b/neopolimatrix/page/default_page/js/default_page.js index 0b657df..5c015a5 100644 --- a/neopolimatrix/page/default_page/js/default_page.js +++ b/neopolimatrix/page/default_page/js/default_page.js @@ -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¶m="%' + $('#nav_search').val() + '%"'); + $('#contentframe').load('./?page=search¶m='+$('#nav_search').val()); }); } diff --git a/neopolimatrix/page/default_page/tpl/default_page.tpl b/neopolimatrix/page/default_page/tpl/default_page.tpl index 0599e2b..5944176 100644 --- a/neopolimatrix/page/default_page/tpl/default_page.tpl +++ b/neopolimatrix/page/default_page/tpl/default_page.tpl @@ -41,6 +41,7 @@

Nach Themen

-
+
+ test
diff --git a/neopolimatrix/page/default_search/default_search.php b/neopolimatrix/page/default_search/default_search.php index c911bdc..945fe2e 100644 --- a/neopolimatrix/page/default_search/default_search.php +++ b/neopolimatrix/page/default_search/default_search.php @@ -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'); diff --git a/neopolimatrix/page/page_neopolimatrix.php b/neopolimatrix/page/page_neopolimatrix.php index a7f2bef..03d09eb 100644 --- a/neopolimatrix/page/page_neopolimatrix.php +++ b/neopolimatrix/page/page_neopolimatrix.php @@ -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(){