X-Git-Url: https://git.cweiske.de/phinde.git/blobdiff_plain/f1a5d014d126621afa80af017da751ccb5ab7f85..d6c817be8dfb9d41ea3f19cecd90619cde97209d:/www/index.php diff --git a/www/index.php b/www/index.php index 6f4ec8f..dbdcfd2 100644 --- a/www/index.php +++ b/www/index.php @@ -16,6 +16,7 @@ if (isset($_GET['page'])) { //PEAR Pager begins at 1 $page = (int)$_GET['page'] - 1; } + $perPage = 10;//$GLOBALS['phinde']['perPage']; $site = null; $siteParam = false; @@ -34,6 +35,13 @@ if (preg_match('#site:([^ ]*)#', $query, $matches)) { $cleanQuery = $query; } +if (isset($_GET['sort']) && $_GET['sort'] == 'date') { + $sort = 'date'; + $baseLink .= '&sort=date'; +} else { + $sort = ''; +} + $filters = array(); if (isset($_GET['filter'])) { $allowedFilter = array('domain', 'language', 'tags', 'term'); @@ -80,7 +88,7 @@ if (preg_match('#site:([^ ]*)#', $query, $matches)) { $timeBegin = microtime(true); $es = new Elasticsearch($GLOBALS['phinde']['elasticsearch']); -$res = $es->search($cleanQuery, $filters, $site, $page, $perPage); +$res = $es->search($cleanQuery, $filters, $site, $page, $perPage, $sort); $timeEnd = microtime(true); $pager = new Html_Pager( @@ -124,11 +132,25 @@ if ($site !== null) { $urlNoSite = null; } +$urlSortRelevance = buildLink( + str_replace('&sort=date', '', $baseLink), $filters, null, null +); +$urlSortDate = $urlSortRelevance . '&sort=date'; + +if (isset($_GET['format']) && $_GET['format'] == 'opensearch') { + $template = 'opensearch'; + $baseLink .= '&format=opensearch'; + header('Content-type: application/atom+xml'); +} else { + $template = 'search'; +} + render( - 'search', + $template, array( 'queryTime' => round($timeEnd - $timeBegin, 2) . 's', 'query' => $query, + 'fullUrl' => Helper::fullUrl($baseLink), 'cleanQuery' => $cleanQuery, 'urlNoSite' => $urlNoSite, 'site' => $site, @@ -137,7 +159,10 @@ render( 'hits' => $res->hits->hits, 'aggregations' => $res->aggregations, 'activeFilters' => $activeFilters, - 'pager' => $pager + 'pager' => $pager, + 'sort' => $sort, + 'urlSortRelevance' => $urlSortRelevance, + 'urlSortDate' => $urlSortDate, ) ); ?>