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

Merge pull request #436 from jygaulier/master-fix1150

Browse Source 
[3.8] fix #1150
This commit is contained in:
Romain Neutron
2013-06-27 04:48:18 -07:00
parent 04adf16fe3 4138c50b22
commit 76b76ce16f
1 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
lib/classes/caption/Field/Value.php
View File

@@ -368,42 +368,14 @@ class caption_Field_Value implements cache_cacheableInterface
$q = "//sy[@w='" . $term_noacc . "' and not(@k)]"; $q = "//sy[@w='" . $term_noacc . "' and not(@k)]";
} }
$qjs = $link = ""; $qjs = $link = "";
// loop on each linked branch for field
foreach ($DOM_branchs as $DOM_branch) { foreach ($DOM_branchs as $DOM_branch) {
$nodes = $XPATH_thesaurus->cache_query($q, $DOM_branch); $nodes = $XPATH_thesaurus->cache_query($q, $DOM_branch);
if ($nodes->length > 0) { $lngfound = false;
$lngfound = false; foreach ($nodes as $node) {
foreach ($nodes as $node) { if ($node->getAttribute("lng") == $this->app['locale.I18n']) {
if ($node->getAttribute("lng") == $this->app['locale.I18n']) { // le terme est dans la bonne langue, on le rend cliquable
// le terme est dans la bonne langue, on le rend cliquable
list($term, $context) = $this->splitTermAndContext($fvalue);
$term = str_replace(array("<em>", "</em>"), array("", ""), $term);
$context = str_replace(array("<em>", "</em>"), array("", ""), $context);
$qjs = $term;
if ($context) {
$qjs .= " [" . $context . "]";
}
$link = $fvalue;
$lngfound = true;
break;
}
$synonyms = $XPATH_thesaurus->query("sy[@lng='" . $this->app['locale.I18n'] . "']", $node->parentNode);
foreach ($synonyms as $synonym) {
$k = $synonym->getAttribute("k");
if ($synonym->getAttribute("w") != $term_noacc || $k != $context_noacc) {
$link = $qjs = $synonym->getAttribute("v");
if ($k) {
$link .= " (" . $k . ")";
$qjs .= " [" . $k . "]";
}
$lngfound = true;
break;
}
}
}
if (! $lngfound) {
list($term, $context) = $this->splitTermAndContext($fvalue); list($term, $context) = $this->splitTermAndContext($fvalue);
$term = str_replace(array("<em>", "</em>"), array("", ""), $term); $term = str_replace(array("<em>", "</em>"), array("", ""), $term);
$context = str_replace(array("<em>", "</em>"), array("", ""), $context); $context = str_replace(array("<em>", "</em>"), array("", ""), $context);
@@ -412,9 +384,34 @@ class caption_Field_Value implements cache_cacheableInterface
$qjs .= " [" . $context . "]"; $qjs .= " [" . $context . "]";
} }
$link = $fvalue; $link = $fvalue;
$lngfound = true;
break;
} }
$synonyms = $XPATH_thesaurus->query("sy[@lng='" . $this->app['locale.I18n'] . "']", $node->parentNode);
foreach ($synonyms as $synonym) {
$k = $synonym->getAttribute("k");
if ($synonym->getAttribute("w") != $term_noacc || $k != $context_noacc) {
$link = $qjs = $synonym->getAttribute("v");
$lngfound = true;
break;
}
}
}
if (! $lngfound) {
list($term, $context) = $this->splitTermAndContext($fvalue);
$term = str_replace(array("<em>", "</em>"), array("", ""), $term);
$context = str_replace(array("<em>", "</em>"), array("", ""), $context);
$qjs = $term;
if ($context) {
$qjs .= " [" . $context . "]";
}
$link = $fvalue;
} }
} }
if ($qjs) { if ($qjs) {
$value = "<a class=\"bounce\" onclick=\"bounce('" . $databox->get_sbas_id() . "','" $value = "<a class=\"bounce\" onclick=\"bounce('" . $databox->get_sbas_id() . "','"
. str_replace("'", "\'", $qjs) . str_replace("'", "\'", $qjs)