X-Git-Url: https://git.cweiske.de/phinde.git/blobdiff_plain/7b4425b096fa8c18d0db9fd9b1ae96d63ee8af55..cd02bac646f42a0cb402ff2dc8240aa01f1f0fb8:/www/index.php diff --git a/www/index.php b/www/index.php index 96d6f7a..6f4ec8f 100644 --- a/www/index.php +++ b/www/index.php @@ -1,17 +1,10 @@ $value) { + if (in_array($type, $allowedFilter)) { + $filters[$type] = filter_var($value, FILTER_SANITIZE_STRING); + } + } +} +$activeFilters = array(); +foreach ($filters as $type => $value) { + $activeFilters[$type] = array( + 'label' => $value, + 'removeUrl' => buildLink($baseLink, $filters, $type, null), + ); +} + +function buildLink($baseLink, $filters, $addFilterType, $addFilterValue) +{ + if ($addFilterValue === null) { + if (array_key_exists($addFilterType, $filters)) { + unset($filters[$addFilterType]); + } + } else { + $filters[$addFilterType] = $addFilterValue; + } + + $params = http_build_query(array('filter' => $filters)); + if (strlen($params)) { + return $baseLink . '&' . $params; + } + return $baseLink; +} + +if (preg_match('#site:([^ ]*)#', $query, $matches)) { + $site = $matches[1]; + $cleanQuery = trim(str_replace('site:' . $site, '', $query)); + $site = Helper::noSchema($site); + $urlNoSite = buildLink('?q=' . urlencode($cleanQuery), $filters, null, null); +} else { + $cleanQuery = $query; + $urlNoSite = null; +} + +$timeBegin = microtime(true); $es = new Elasticsearch($GLOBALS['phinde']['elasticsearch']); -$res = $es->search($query, $page, $perPage); +$res = $es->search($cleanQuery, $filters, $site, $page, $perPage); +$timeEnd = microtime(true); $pager = new Html_Pager( $res->hits->total, $perPage, $page + 1, - '?q=' . $query + $baseLink ); -foreach ($res->hits->hits as $hit) { +foreach ($res->hits->hits as &$hit) { $doc = $hit->_source; - if ($doc->title == '') { + if (!isset($doc->title) || $doc->title == '') { $doc->title = '(no title)'; + $doc->htmlTitle = '(no title)'; + } + if (isset($hit->highlight->title[0])) { + $doc->htmlTitle = $hit->highlight->title[0]; + } else { + $doc->htmlTitle = htmlspecialchars($doc->title); } - echo '
'
- . ''
- . htmlspecialchars($doc->title)
- . '';
- if (isset($doc->author->name)) {
- echo ' by '
- . htmlspecialchars($doc->author->name)
- . '';
+ if (isset($hit->highlight->text[0])) {
+ $doc->htmlText = $hit->highlight->text[0];
+ } else {
+ $doc->htmlText = null;
}
- echo '
'
- . htmlspecialchars(preg_replace('#^.*://#', '', $doc->url))
- . '';
+
+ $doc->extra = new \stdClass();
+ $doc->extra->cleanUrl = preg_replace('#^.*://#', '', $doc->url);
if (isset($doc->modate)) {
- echo '
Changed: ' . substr($doc->modate, 0, 10);
+ $doc->extra->day = substr($doc->modate, 0, 10);
+ }
+}
+
+foreach ($res->aggregations as $key => &$aggregation) {
+ foreach ($aggregation->buckets as &$bucket) {
+ $bucket->url = buildLink($baseLink, $filters, $key, $bucket->key);
}
- echo '