hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2825 from aynsix/PHRAS-2306-port-search-thesaurus-all-language

Browse Source 
PHRAS-2306 port to 4.1 search thesaurus term to all language
This commit is contained in:
Nicolas Maillat
2018-11-26 09:29:14 +00:00
committed by GitHub
parent 5fce1c4311 d413c86912
commit b78707090c
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php
View File

@@ -1426,12 +1426,7 @@ class ThesaurusXmlHttpController extends Controller
public function searchTermJson(Request $request) public function searchTermJson(Request $request)
{ {
if (null === $lng = $request->get('lng')) { $lng = $request->get('lng');
$data = explode('_', $this->app['locale']);
if (count($data) > 0) {
$lng = $data[0];
}
}
$html = ''; $html = '';
$sbid = (int) $request->get('sbid'); $sbid = (int) $request->get('sbid');
@@ -1485,7 +1480,10 @@ class ThesaurusXmlHttpController extends Controller
$q2 .= ' and starts-with(@k, \'' . \thesaurus::xquery_escape($unicode->remove_indexer_chars($t[1])) . '\')'; $q2 .= ' and starts-with(@k, \'' . \thesaurus::xquery_escape($unicode->remove_indexer_chars($t[1])) . '\')';
} }
$q2 .= ' and @lng=\'' . \thesaurus::xquery_escape($lng) . '\''; if($lng != null){
$q2 .= ' and @lng=\'' . \thesaurus::xquery_escape($lng) . '\'';
}
$q .= ('//sy[' . $q2 . ']'); $q .= ('//sy[' . $q2 . ']');
$nodes = $xpath->query($q); $nodes = $xpath->query($q);