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

fix #857

Browse Source
This commit is contained in:
jygaulier
2013-06-24 19:09:53 +02:00
parent 22da3229e9
commit 3a9dfd9e07
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
View File

@@ -426,7 +426,12 @@ class PhraseaEngine implements SearchEngineInterface
$propositions = $this->getPropositions();
return new SearchEngineResult($records, $query, $row['duration'], $offset, $row['total'], $row['total'], $error, '', new ArrayCollection(), $propositions, '');
$tsug = array();
foreach($this->qp['main']->proposals['QUERIES'] as $q)
$tsug[] = $q;
$suggestions = new ArrayCollection($tsug);
return new SearchEngineResult($records, $query, $row['duration'], $offset, $row['total'], $row['total'], $error, '', $suggestions, $propositions, '');
}
/**

13
lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineQueryParser.php
View File

@@ -606,7 +606,7 @@ class PhraseaEngineQueryParser
$lng = $n->getAttribute("lng");
if (!array_key_exists($lng, $tsy))
$tsy[$lng] = array();
$zsy = array("v" => $n->getAttribute("v"), "w" => $n->getAttribute("w"), "k" => $n->getAttribute("k"));
$zsy = array("v" => $n->getAttribute("v"), "w" => $n->getAttribute("w"), "k" => $n->getAttribute("k"), "lng" => $lng);
if ($lngfound == "?" || ($lng == $this->lng && $lngfound != $lng)) {
$lngfound = $lng;
@@ -625,7 +625,9 @@ class PhraseaEngineQueryParser
}
}
$this->proposals['QUERIES'][$syfound["w"]] = $syfound["w"];
$ksug = $syfound["w"] . '(' . $syfound["k"] . ')';
$vsug = $syfound["w"] . ($syfound["k"] ? (' (' . $syfound["k"] . ')'):'');
$this->proposals['QUERIES'][$ksug] = array('value'=>$vsug, 'current'=>$node->getAttribute("marked")=="2", 'hits'=>null, 'lng'=>$syfound['lng']);
$thtml = $syfound["v"];
$kjs = $syfound["k"] ? ("'" . \p4string::MakeString($syfound["k"], "js") . "'") : "null";
@@ -655,7 +657,6 @@ class PhraseaEngineQueryParser
}
}
}
$n->removeAttribute("marked");
for ($i = 0; array_key_exists($syfound . $i, $tsort) && $i < 9999; $i++)
;
$tsort[$syfound . $i] = $n;
@@ -667,6 +668,8 @@ class PhraseaEngineQueryParser
$this->propAsHTML($n, $html, $path, $depth + 1);
}
$node->removeAttribute("marked");
if ($depth > 0)
$html .= $tab . "</div>\n";
}
@@ -837,8 +840,6 @@ class PhraseaEngineQueryParser
}
// printf("<%s id='%s'><br/>\n", $DOMnode->tagName, $DOMnode->getAttribute("id"));
// printf("<b>found node &lt;%s id='%s' w='%s' k='%s'></b><br/>\n", $DOMnode->nodeName, $DOMnode->getAttribute('id'), $DOMnode->getAttribute('w'), $DOMnode->getAttribute('k'));
// on marque le terme principal
$DOMnode->parentNode->setAttribute("term", "1");
// on commence par marquer les fils directs. rappel:$DOMnode pointe sur un sy
for ($node = $DOMnode->parentNode->firstChild; $node; $node = $node->nextSibling) {
if ($node->nodeName == "te") {
@@ -852,6 +853,8 @@ class PhraseaEngineQueryParser
break; // on a dépassé la racine du thésaurus
$node->setAttribute("marked", "1");
}
// on marque spécialement le node principal
$DOMnode->parentNode->setAttribute("marked", "2");
}
public function astext_ambigu($tree, &$ambiguites, $mouseCallback = "void", $depth = 0)