From: Christian Weiske Date: Thu, 11 Feb 2016 21:43:34 +0000 (+0100) Subject: opensearch support X-Git-Tag: v0.1.0 X-Git-Url: https://git.cweiske.de/phinde.git/commitdiff_plain/d6c817be8dfb9d41ea3f19cecd90619cde97209d?ds=sidebyside opensearch support --- diff --git a/README.rst b/README.rst index 3d10657..7977635 100644 --- a/README.rst +++ b/README.rst @@ -24,6 +24,7 @@ Features - Query: ``foo bar site:example.org/dir/`` - or use the ``site`` GET parameter: ``/?q=foo&site=example.org/dir`` +- OpenSearch support with HTML and Atom result lists ============ diff --git a/data/templates/base.htm b/data/templates/base.htm index f54cd0c..a497f01 100644 --- a/data/templates/base.htm +++ b/data/templates/base.htm @@ -9,6 +9,7 @@ + {% block meta %}{% endblock %} diff --git a/data/templates/opensearch.htm b/data/templates/opensearch.htm new file mode 100644 index 0000000..a1000f1 --- /dev/null +++ b/data/templates/opensearch.htm @@ -0,0 +1,21 @@ + + + "{{query}}" search results + + {{"now"|date("c")}} + {{fullUrl}} + {{hitcount}} + {% for hit in hits %} + {% set doc = hit._source %} + + {{doc.title}} + + {{doc.url}} + {% if doc.modate %} + {{doc.modate|date('c')}} + {% endif %} + {{doc.htmlText|striptags}} + + {% endfor %} + diff --git a/data/templates/opensearchdescription.htm b/data/templates/opensearchdescription.htm new file mode 100644 index 0000000..6bc2f96 --- /dev/null +++ b/data/templates/opensearchdescription.htm @@ -0,0 +1,9 @@ + + + {{apptitle}} + Search + + + diff --git a/data/templates/search.htm b/data/templates/search.htm index c7b1bb7..f0481a9 100644 --- a/data/templates/search.htm +++ b/data/templates/search.htm @@ -18,7 +18,7 @@
diff --git a/src/phinde/Helper.php b/src/phinde/Helper.php index 312c5e5..43345ba 100644 --- a/src/phinde/Helper.php +++ b/src/phinde/Helper.php @@ -41,5 +41,23 @@ class Helper ) ); } + + /** + * Create a full URL with protocol and host name + * + * @param string $path Path to the file, with leading / + * + * @return string Full URL + */ + public static function fullUrl($path = '/') + { + if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']) { + $prot = 'https'; + } else { + $prot = 'http'; + } + return $prot . '://' . $_SERVER['HTTP_HOST'] . $path; + } + } ?> diff --git a/www/index.php b/www/index.php index 54d5da8..dbdcfd2 100644 --- a/www/index.php +++ b/www/index.php @@ -137,11 +137,20 @@ $urlSortRelevance = buildLink( ); $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, diff --git a/www/opensearchdescription.php b/www/opensearchdescription.php new file mode 100644 index 0000000..443546e --- /dev/null +++ b/www/opensearchdescription.php @@ -0,0 +1,17 @@ + Helper::fullUrl('/'), + ) +); +?> \ No newline at end of file diff --git a/www/www-header.php b/www/www-header.php index da0d74c..e7c4542 100644 --- a/www/www-header.php +++ b/www/www-header.php @@ -27,7 +27,7 @@ function render($tplname, $vars = array(), $return = false) //$vars['htmlhelper'] = new HtmlHelper(); } $vars['apptitle'] = 'cweiske.de search'; - $vars['baseurl'] = '/'; + $vars['baseUrl'] = '/'; $template = $GLOBALS['twig']->loadTemplate($tplname . '.htm'); if ($return) {