From 7167c2054394282acfe84cba1fdfdcc15529448e Mon Sep 17 00:00:00 2001 From: Sebastian Kurfuerst Date: Fri, 20 Mar 2015 21:16:37 +0100 Subject: [PATCH 1/3] [BUGFIX] correct path towards SearchForm Template This is a required bugfix on case-sensitive file systems. --- Resources/Private/TypoScript/SearchPlugin.ts2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Private/TypoScript/SearchPlugin.ts2 b/Resources/Private/TypoScript/SearchPlugin.ts2 index b8051d6..2c61b10 100644 --- a/Resources/Private/TypoScript/SearchPlugin.ts2 +++ b/Resources/Private/TypoScript/SearchPlugin.ts2 @@ -32,7 +32,7 @@ prototype(Flowpack.SearchPlugin:Search) { prototype(Flowpack.SearchPlugin:Search.Form) < prototype(TYPO3.TypoScript:Template) { - templatePath = 'resource://Flowpack.SearchPlugin/Private/Templates/NodeTypes/Search.Form.Html' + templatePath = 'resource://Flowpack.SearchPlugin/Private/Templates/NodeTypes/Search.Form.html' searchWord = ${request.arguments.search} } From 8c832c4cb6d58e7171813a85c47a970ab2b4a5cf Mon Sep 17 00:00:00 2001 From: Aske Ertmann Date: Tue, 30 Dec 2014 17:31:06 +0100 Subject: [PATCH 2/3] [TASK] Improve output to something useful - Adds summary from the fulltext using highlighting - Adds pagination of results - Adds breadcrumb for each result - Wraps output in container for styling This change has originally been based upon https://github.com/mocdk/Flowpack.SearchPlugin/commit/c3267308f1fdb68c846474ea81fe138cc278d7bb. --- .../EelHelper/SearchArrayHelper.php | 47 +++++++++++++++++++ .../CanRenderImplementation.php | 2 +- Configuration/Settings.yaml | 6 ++- .../Private/Templates/NodeTypes/Search.html | 15 ++++-- .../SearchResult/DocumentSearchResult.html | 19 ++++++-- .../Private/TypoScript/ResultRendering.ts2 | 9 ++-- Resources/Private/TypoScript/SearchPlugin.ts2 | 17 +++---- 7 files changed, 87 insertions(+), 28 deletions(-) create mode 100644 Classes/Flowpack/SearchPlugin/EelHelper/SearchArrayHelper.php diff --git a/Classes/Flowpack/SearchPlugin/EelHelper/SearchArrayHelper.php b/Classes/Flowpack/SearchPlugin/EelHelper/SearchArrayHelper.php new file mode 100644 index 0000000..55c07d3 --- /dev/null +++ b/Classes/Flowpack/SearchPlugin/EelHelper/SearchArrayHelper.php @@ -0,0 +1,47 @@ + f:format.raw()}> + {searchForm -> f:format.raw()} -{searchForm -> f:format.raw()} - -Showing {searchResults -> f:count()} of {totalSearchResults} results - -{searchResultRenderer -> f:format.raw()} + + + Showing {results.accessibleCount} of {totalSearchResults} results + + + + \ No newline at end of file diff --git a/Resources/Private/Templates/SearchResult/DocumentSearchResult.html b/Resources/Private/Templates/SearchResult/DocumentSearchResult.html index 0edacfc..11a7854 100644 --- a/Resources/Private/Templates/SearchResult/DocumentSearchResult.html +++ b/Resources/Private/Templates/SearchResult/DocumentSearchResult.html @@ -1,9 +1,18 @@ {namespace neos=TYPO3\Neos\ViewHelpers} +{title} - - {title} -
+ +

+ + {fragment -> f:format.raw()}{f:if(condition: fragmentIterator.isLast, else: '...')} + +

- - {description} +
+ Path: + + + + +
\ No newline at end of file diff --git a/Resources/Private/TypoScript/ResultRendering.ts2 b/Resources/Private/TypoScript/ResultRendering.ts2 index 05407ae..c2da059 100644 --- a/Resources/Private/TypoScript/ResultRendering.ts2 +++ b/Resources/Private/TypoScript/ResultRendering.ts2 @@ -15,14 +15,11 @@ prototype(Flowpack.SearchPlugin:SingleResult) < prototype(TYPO3.TypoScript:Case) prototype(TYPO3.Neos:DocumentSearchResult) < prototype(TYPO3.TypoScript:Template) { templatePath = 'resource://Flowpack.SearchPlugin/Private/Templates/SearchResult/DocumentSearchResult.html' node = ${node} + highlight = ${Flowpack.SearchPlugin.Array.flatten(searchHit.highlight)} title = ${q(node).property('title')} description = '' + parents = ${Array.reverse(q(node).parents('[instanceof TYPO3.Neos:Document]').get())} } -prototype(TYPO3.Neos.NodeTypes:PageSearchResult) < prototype(TYPO3.Neos:DocumentSearchResult) - - -prototype(TYPO3.NeosDemoTypo3Org:ChapterSearchResult) < prototype(TYPO3.Neos:DocumentSearchResult) { - description = ${q(node).property('chapterDescription')} -} \ No newline at end of file +prototype(TYPO3.Neos.NodeTypes:PageSearchResult) < prototype(TYPO3.Neos:DocumentSearchResult) \ No newline at end of file diff --git a/Resources/Private/TypoScript/SearchPlugin.ts2 b/Resources/Private/TypoScript/SearchPlugin.ts2 index 2c61b10..e3c3bdd 100644 --- a/Resources/Private/TypoScript/SearchPlugin.ts2 +++ b/Resources/Private/TypoScript/SearchPlugin.ts2 @@ -1,24 +1,22 @@ - prototype(Flowpack.SearchPlugin:Search) { - // we store the search results in the TypoScript context, so that they bubble through the nested elements like the searchResultRenderer - @override.searchResults = ${this.searchQuery.execute()} - - - searchQuery = ${Search.query(site).fulltext(request.arguments.search || '')} + searchTerm = ${request.arguments.search} + searchQuery = ${this.searchTerm ? Search.query(site).fulltext(this.searchTerm) : null} totalSearchResults = ${this.searchQuery.count()} - searchResults = ${searchResults} searchForm = Flowpack.SearchPlugin:Search.Form searchResultRenderer = TYPO3.TypoScript:Collection { + // the "searchResults" are filled from the ViewHelper. collection = ${searchResults} itemRenderer = Flowpack.SearchPlugin:SingleResult itemName = 'node' + // we also make the full ElasticSearch hit available to nested rendering, if possible + itemRenderer.@override.searchHit = ${searchResults.searchHitForNode(node)} } - searchResultRenderer.@process.wrap = ${'
    ' + value + '
'} + searchResultRenderer.@process.wrap = ${'
    ' + value + '
'} prototype(Flowpack.SearchPlugin:SingleResult).@process.wrap = ${'
  • ' + value + '
    • '} @cache { @@ -34,5 +32,4 @@ prototype(Flowpack.SearchPlugin:Search) { prototype(Flowpack.SearchPlugin:Search.Form) < prototype(TYPO3.TypoScript:Template) { templatePath = 'resource://Flowpack.SearchPlugin/Private/Templates/NodeTypes/Search.Form.html' searchWord = ${request.arguments.search} -} - +} \ No newline at end of file From d569ecda59b308c8558c92937ef5c57759973f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Klixbu=CC=88ll=20Langeland?= Date: Mon, 17 Nov 2014 14:04:21 +0100 Subject: [PATCH 3/3] [FEATURE] Suggestion support adapted from https://github.com/mocdk/Flowpack.SearchPlugin/commit/c7d340dcc12e859ce23d3e39292d5884764f8592 --- .../Controller/SuggestController.php | 84 +++++++++++++++++++ Configuration/Policy.yaml | 11 +++ Configuration/Routes.yaml | 11 +++ .../Templates/NodeTypes/Search.Form.html | 6 +- Resources/Private/TypoScript/SearchPlugin.ts2 | 1 + 5 files changed, 110 insertions(+), 3 deletions(-) create mode 100644 Classes/Flowpack/SearchPlugin/Controller/SuggestController.php create mode 100644 Configuration/Policy.yaml create mode 100644 Configuration/Routes.yaml diff --git a/Classes/Flowpack/SearchPlugin/Controller/SuggestController.php b/Classes/Flowpack/SearchPlugin/Controller/SuggestController.php new file mode 100644 index 0000000..92d6bee --- /dev/null +++ b/Classes/Flowpack/SearchPlugin/Controller/SuggestController.php @@ -0,0 +1,84 @@ + + * @package Flowpack\SearchPlugin\Controller + */ +class SuggestController extends ActionController { + + /** + * @Flow\Inject + * @var \Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient + */ + protected $elasticSearchClient; + + /** + * The node inside which searching should happen + * + * @var NodeInterface + */ + protected $contextNode; + + /** + * @Flow\Inject + * @var \Flowpack\ElasticSearch\ContentRepositoryAdaptor\LoggerInterface + */ + protected $logger; + + /** + * @var boolean + */ + protected $logThisQuery = FALSE; + + /** + * @var string + */ + protected $logMessage; + + /** + * @var array + */ + protected $viewFormatToObjectNameMap = array( + 'json' => 'TYPO3\Flow\Mvc\View\JsonView' + ); + + /** + * @param NodeInterface $node + * @param string $term + */ + public function indexAction(NodeInterface $node, $term) { + $request = array( + 'suggests' => array( + 'text' => $term, + 'term' => array( + 'field' => '_all' + ) + ) + ); + + $response = $this->elasticSearchClient->getIndex()->request('GET', '/_suggest', array(), json_encode($request))->getTreatedContent(); + $suggestions = array_map(function($option) { + return $option['text']; + }, $response['suggests'][0]['options']); + + $this->view->assign('value', $suggestions); + } + +} \ No newline at end of file diff --git a/Configuration/Policy.yaml b/Configuration/Policy.yaml new file mode 100644 index 0000000..b323d83 --- /dev/null +++ b/Configuration/Policy.yaml @@ -0,0 +1,11 @@ +privilegeTargets: + TYPO3\Flow\Security\Authorization\Privilege\Method\MethodPrivilege: + Flowpack_SearchPlugin_Controller_SuggestController: + matcher: method(Flowpack\SearchPlugin\Controller\SuggestController->indexAction()) + +roles: + 'TYPO3.Flow:Everybody': + privileges: + - + privilegeTarget: Flowpack_SearchPlugin_Controller_SuggestController + permission: GRANT \ No newline at end of file diff --git a/Configuration/Routes.yaml b/Configuration/Routes.yaml new file mode 100644 index 0000000..ccadb24 --- /dev/null +++ b/Configuration/Routes.yaml @@ -0,0 +1,11 @@ +# DataSourceController routes +- + name: 'flowpack/searchplugin - SuggestController->index' + uriPattern: 'flowpack/searchplugin' + defaults: + '@package': 'Flowpack.SearchPlugin' + '@controller': 'Suggest' + '@action': 'index' + '@format': 'json' + appendExceedingArguments: TRUE + httpMethods: ['GET'] \ No newline at end of file diff --git a/Resources/Private/Templates/NodeTypes/Search.Form.html b/Resources/Private/Templates/NodeTypes/Search.Form.html index 1bffd5a..6a28db3 100644 --- a/Resources/Private/Templates/NodeTypes/Search.Form.html +++ b/Resources/Private/Templates/NodeTypes/Search.Form.html @@ -1,4 +1,4 @@ -
    - - + + +
    \ No newline at end of file diff --git a/Resources/Private/TypoScript/SearchPlugin.ts2 b/Resources/Private/TypoScript/SearchPlugin.ts2 index e3c3bdd..f7cfd25 100644 --- a/Resources/Private/TypoScript/SearchPlugin.ts2 +++ b/Resources/Private/TypoScript/SearchPlugin.ts2 @@ -30,6 +30,7 @@ prototype(Flowpack.SearchPlugin:Search) { prototype(Flowpack.SearchPlugin:Search.Form) < prototype(TYPO3.TypoScript:Template) { + node = ${site} templatePath = 'resource://Flowpack.SearchPlugin/Private/Templates/NodeTypes/Search.Form.html' searchWord = ${request.arguments.search} } \ No newline at end of file