if (!isset($_GET['q'])) {
$_GET['q'] = '';
}
+$query = trim($_GET['q']);
-$query = $_GET['q'];
$page = 0;
if (isset($_GET['page'])) {
if (!is_numeric($_GET['page'])) {
//PEAR Pager begins at 1
$page = (int)$_GET['page'] - 1;
}
+
$perPage = 10;//$GLOBALS['phinde']['perPage'];
$site = null;
$siteParam = false;
$cleanQuery = $query;
}
+if (isset($_GET['sort'])
+ && ($_GET['sort'] === 'date' || $_GET['sort'] === 'score')
+) {
+ $sortMode = $_GET['sort'];
+} else {
+ $sortMode = $GLOBALS['phinde']['defaultSort'];
+}
+$sort = $sortMode;
+if ($sortMode !== $GLOBALS['phinde']['defaultSort']) {
+ $baseLink .= '&sort=' . $sortMode;
+}
+
$filters = array();
if (isset($_GET['filter'])) {
$allowedFilter = array('domain', 'language', 'tags', 'term');
$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(
$doc->extra = new \stdClass();
$doc->extra->cleanUrl = preg_replace('#^.*://#', '', $doc->url);
- if (isset($doc->modate)) {
- $doc->extra->day = substr($doc->modate, 0, 10);
+ if (isset($doc->status->modate)) {
+ $doc->extra->day = substr($doc->status->modate, 0, 10);
}
}
$urlNoSite = null;
}
+$urlSortBase = buildLink(
+ preg_replace('#&sort=[^&]+#', '', $baseLink), $filters, null, null
+);
+$urlSorts = [];
+foreach (['date', 'score'] as $sortMode) {
+ if ($sortMode === $GLOBALS['phinde']['defaultSort']) {
+ $urlSorts[$sortMode] = $urlSortBase;
+ } else {
+ $urlSorts[$sortMode] = $urlSortBase . '&sort=' . $sortMode;
+ }
+}
+
+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,
'hits' => $res->hits->hits,
'aggregations' => $res->aggregations,
'activeFilters' => $activeFilters,
- 'pager' => $pager
+ 'pager' => $pager,
+ 'sort' => $sort,
+ 'urlSorts' => $urlSorts,
+ 'hitTemplate' => 'search/' . $GLOBALS['phinde']['hitTemplate'],
+ 'sidebarinclude' => $GLOBALS['phinde']['sidebarinclude'],
)
);
?>