diff --git a/content/search-results.php b/content/search-results.php index c7cfa62..d09d065 100644 --- a/content/search-results.php +++ b/content/search-results.php @@ -1,5 +1,10 @@ @@ -48,57 +56,40 @@ session_start();

Suchergebnisse

-

3 Treffer für Ihre Suchanfrage

+

Treffer für Ihre Suchanfrage ""

+ + + +
+
+

+ + + +

+

Von:

+
+
→
+
+ - - - -

- Bitte überprüfe deine Sucheingabe und versuche es erneut! -

+ +

Keine Beiträge zu diesem Suchbegriff gefunden.

+ +

Bitte überprüfe deine Sucheingabe und versuche es erneut!

+ - -
-
-

- Pythagoras -

-

Von: Max Mustermann

-
-
→
-
- - -
-
-

- Pythagoras -

-

Von: Max Mustermann

-
-
→
-
- - -
-
-

- Pythagoras -

-

Von: Max Mustermann

-
-
→
-
-
diff --git a/includes/search.php b/includes/search.php index 1e7ea90..15ae4d2 100644 --- a/includes/search.php +++ b/includes/search.php @@ -2,5 +2,10 @@ Suchleiste. Wird via PHP später in alle Seiten eingebunden --> - - \ No newline at end of file +
+ + + + + +
diff --git a/php/controller/search-results-controller.php b/php/controller/search-results-controller.php index 30b02a8..161c874 100644 --- a/php/controller/search-results-controller.php +++ b/php/controller/search-results-controller.php @@ -2,28 +2,67 @@ session_start(); require_once '../model/LocalArticleManager.php'; require_once '../model/ArticleManager.php'; +require_once '../model/Article.php'; -if ($_SERVER["REQUEST_METHOD"] === "POST") { - if(!isset($_POST["search"])){ +if ($_SERVER["REQUEST_METHOD"] === "GET" && isset($_GET["q"])) { + + $search = trim($_GET["q"]); + if (empty($search)) { + $_SESSION["search_results"] = []; + $_SESSION["search_query"] = ""; $_SESSION["message"] = "missing_parameters"; - header("location: ../../index.php?pfad=search-results"); } else { - - $search = $_POST["search"]; - try { + $articleManager = ArticleManager::getInstance(); - $articleManager->search($search); // TODO: Methode implementieren. + + $results = $articleManager->search($search); + + $sortStyle = $_GET['sort'] ?? 'alphabet'; + $_SESSION['search_sort'] = $sortStyle; + + if ($sortStyle === 'alphabet') { + // Titel aufsteigend alphabetiisch sortiert + usort($results, function($a, $b) { + return strcasecmp($a->title, $b->title); + }); + } elseif ($sortStyle === 'newest') { + // Datum neu zu alt sortiert + usort($results, function($a, $b) { + return strcmp($b->creationDate, $a->creationDate); + }); + } elseif ($sortStyle === 'oldest') { + // Datum alt zu neu sortiert + usort($results, function($a, $b) { + return strcmp($a->creationDate, $b->creationDate); + }); + } + + // Ergebnisse werden in ein flaches array umgewandelt, da sont incomplete-PHP error im Ergebnis + $safeArrayResults = []; + foreach ($results as $obj) { + $safeArrayResults[] = [ + "id" => $obj->id, + "title" => $obj->title, + "content" => $obj->content, + "author" => $obj->author, + "category" => $obj->category, + "tags" => $obj->tags, + "creationDate" => $obj->creationDate + ]; + } + + $_SESSION["search_results"] = $safeArrayResults; + $_SESSION["search_query"] = $search; + $_SESSION["message"] = "new_search_results"; + } catch (Exception $e){ $_SESSION["message"] = "internal_error"; } - $_SESSION["message"] = "new_search_results"; - // TODO: Liste mit Artikeln in der Suchreihenfolge übertragen. - // Weiterleitung zur Suchergebnisanzeige - header("location: ../../index.php?pfad=search-results"); - exit(); - } + header("Location: ../../index.php?pfad=search-results"); + exit(); + } ?> \ No newline at end of file diff --git a/php/model/Article.php b/php/model/Article.php index 9ffd701..4b1d492 100644 --- a/php/model/Article.php +++ b/php/model/Article.php @@ -7,13 +7,13 @@ */ class Article { - private $id; - private $title; - private $content; - private $author; - private $creationDate; - private $category; - private $tags; + public $id; + public $title; + public $content; + public $author; + public $creationDate; + public $category; + public $tags; /** * Konstruktor diff --git a/php/model/ArticleManager.php b/php/model/ArticleManager.php index 7379c74..5887cc5 100644 --- a/php/model/ArticleManager.php +++ b/php/model/ArticleManager.php @@ -44,4 +44,5 @@ class ArticleManager extends LocalArticleManager return $articleManager; } + } \ No newline at end of file diff --git a/php/model/ArticleManagerDAO.php b/php/model/ArticleManagerDAO.php index 92bdfa0..973e7e1 100644 --- a/php/model/ArticleManagerDAO.php +++ b/php/model/ArticleManagerDAO.php @@ -67,5 +67,15 @@ interface ArticleManagerDAO */ public function getArticlesByAuthor($author); + /** + * Durchsucht die vorhandenen Beiträge nach einem bestimmten Suchbegriff. + * Die Suche prüft, ob das übergebene Keyword im Titel oder im Inhalt eines Beitrags vorkommt. + * (Unabhängig von Groß-und Kleinschreibung) + * @param string $keyword Der eingegebene Suchbegriff. + * @return array Ein Array von Artikeln ,die dem Suchkriterium entsprechen. Wenn nichts gefunden wird, ein leeres Array. + */ + public function search(string $keyword): array; + + } ?> \ No newline at end of file diff --git a/php/model/LocalArticleManager.php b/php/model/LocalArticleManager.php index 7e795f0..569c2eb 100644 --- a/php/model/LocalArticleManager.php +++ b/php/model/LocalArticleManager.php @@ -168,5 +168,40 @@ class LocalArticleManager implements ArticleManagerDAO { } return $filteredArticles; } + + + public function search(string $keyword): array + { + $articles = $this->getAllArticles(); + $filteredArticles = []; + + if (!is_array($articles)) { + return []; + } + + $cleanKeyword = strtolower(trim($keyword)); + + foreach ($articles as $article) { + $title = isset($article['title']) ? strtolower((string)$article['title']) : ''; + $content = isset($article['content']) ? strtolower((string)$article['content']) : ''; + + if (($cleanKeyword !== '' && strpos($title, $cleanKeyword) !== false) || + ($cleanKeyword !== '' && strpos($content, $cleanKeyword) !== false)) { + + $filteredArticles[] = new Article( + intval($article['id'] ?? 0), + $article['title'] ?? '', + $article['content'] ?? '', + $article['author'] ?? '', + $article['category'] ?? '', + $article['tags'] ?? '', + $article['creationDate'] ?? '' + ); + } + } + + return $filteredArticles; + } + } ?> \ No newline at end of file