Merge remote-tracking branch 'mark/elastic-search'

Author: predominant

scripts/populate_search_index.php

@@ -0,0 +1,95 @@
+#!/usr/bin/env php
+<?php
+/**
+ * Utility script to populate the elastic search indexes
+ *
+ */
+
+// Elastic search config
+define('ES_URL', 'http://localhost:9200');
+define('ES_INDEX', 'documentation');
+
+
+function main($argv) {
+if (empty($argv[1])) {
+echo "A language to scan is required.\n";
+exit(1);
+}
+$lang = $argv[1];
+
+$directory = new RecursiveDirectoryIterator($lang);
+$recurser = new RecursiveIteratorIterator($directory);
+$matcher = new RegexIterator($recurser, '/\.rst/');
+
+foreach ($matcher as $file) {
+updateIndex($lang, $file);
+}
+echo "\nIndex update complete\n";
+}
+
+function updateIndex($lang, $file) {
+$fileData = readFileData($file);
+$filename = $file->getPathName();
+list($filename) = explode('.', $filename);
+
+$path = $filename . '.html';
+$id = str_replace($lang . '/', '', $filename);
+$id = str_replace('/', '-', $id);
+$id = trim($id, '-');
+
+$url = implode('/', array(ES_URL, ES_INDEX, $lang, $id));
+
+$data = array(
+'contents' => $fileData['contents'],
+'title' => $fileData['title'],
+'url' => $path,
+);
+
+$data = json_encode($data);
+$size = strlen($data);
+
+$fh = fopen('php://memory', 'rw');
+fwrite($fh, $data);
+rewind($fh);
+
+echo "Sending request:\n\tfile: $file\n\turl: $url\n";
+
+$ch = curl_init($url);
+curl_setopt($ch, CURLOPT_PUT, true);
+curl_setopt($ch, CURLOPT_INFILE, $fh);
+curl_setopt($ch, CURLOPT_INFILESIZE, $size);
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+$response = curl_exec($ch);
+$metadata = curl_getinfo($ch);
+
+if ($metadata['http_code'] > 400) {
+echo "[ERROR] Failed to complete request.\n";
+var_dump($response);
+exit(2);
+}
+
+curl_close($ch);
+fclose($fh);
+
+echo "Sent $file\n";
+}
+
+function readFileData($file) {
+$contents = file_get_contents($file);
+
+// extract the title and guess that things underlined with # or == and first in the file
+// are the title.
+preg_match('/^(.*)\n[=#]+\n/', $contents, $matches);
+$title = $matches[1];
+
+// Remove the title from the indexed text.
+$contents = str_replace($matches[0], '', $contents);
+
+// Remove title markers from the text.
+$contents = preg_replace('/\n[-=~]+\n/', '', $contents);
+
+return compact('contents', 'title');
+}
+
+main($argv);

themes/cakephp/layout.html

@@ -5,6 +5,9 @@
 
 {% block extrahead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<script type="text/javascript">
+window.lang = "{{ language }}";
+</script>
 {% endblock %}
 
 {%- set script_files = script_files + ["_static/app.js", "_static/modernizr.foundation.js", "_static/foundation.js"] -%}

themes/cakephp/search.html

@@ -0,0 +1,33 @@
+{% extends "layout.html" %}
+
+{% set title = _('Search') %}
+{% set script_files = script_files + ['_static/search.js'] %}
+
+{% block body %}
+ <h1 id="search-documentation">{{ _('Search') }}</h1>
+ <div id="fallback" class="admonition warning">
+ <script type="text/javascript">$('#fallback').hide();</script>
+ <p>
+ {% trans %}Please activate JavaScript to enable the search
+ functionality.{% endtrans %}
+ </p>
+ </div>
+
+ <p>
+ {% trans %}From here you can search these documents. Enter your search
+ words into the box below and click "search". Note that the search
+ function will automatically search for all of the words. Pages
+ containing fewer words won't appear in the result list.{% endtrans %}
+ </p>
+
+ <form action="" method="get" class="standalone-search">
+ <input type="search" autocomplete="off" class="search-input" name="q" value="" />
+<input type="hidden" name="lang" value="{{ language }}" />
+ <input type="submit" class="search-submit search-big button red" value="{{ _('search') }}" />
+ </form>
+ <div id="search-results">
+ <ul>
+ </ul>
+ </div>
+ <div id="pagination"></div>
+{% endblock %}

themes/cakephp/searchbox.html

@@ -10,7 +10,7 @@
 <div id="searchbox" class="columns nine phone-three">
 
 <form id="searchform" class="search" action="{{ pathto('search') }}" method="get">
-<input class="search-input" type="search" name="q" size="18" />
+<input class="search-input" autocomplete="off" type="search" name="q" size="18" />
 <input class="search-submit search-big button red" type="submit" value="{{ _('Search') }}" />
 <input type="hidden" name="check_keywords" value="yes" />
 <input type="hidden" name="area" value="default" />