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

Fix coding standards

Browse Source
This commit is contained in:
Romain Neutron
2012-01-26 12:32:37 +01:00
parent 692bb01b75
commit 06b8df26b1
312 changed files with 2017 additions and 1651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/classes/searchEngine/adapter/phrasea/engine.class.php
View File

@@ -143,7 +143,7 @@ class searchEngine_adapter_phrasea_engine extends searchEngine_adapter_abstract
public function set_options(searchEngine_options $options)
{
$this->options = $options;
$this->opt_search_type = (int) $options->get_search_type();
$this->opt_bases = $options->get_bases();
$this->opt_fields = $options->get_fields();
@@ -397,7 +397,7 @@ class searchEngine_adapter_phrasea_engine extends searchEngine_adapter_abstract
$total_time = 0;
$sort = '';
if($this->options->get_sortby())
{
switch($this->options->get_sortord())
@@ -412,7 +412,7 @@ class searchEngine_adapter_phrasea_engine extends searchEngine_adapter_abstract
}
$sort .= '0' . $this->options->get_sortby();
}
foreach ($this->queries as $sbas_id => $qry)
{
$this->results[$sbas_id] = phrasea_query2(
@@ -651,7 +651,7 @@ class searchEngine_adapter_phrasea_engine extends searchEngine_adapter_abstract
{
$val = $field['value'];
}
$ret[] = $val;
}

44
lib/classes/searchEngine/adapter/phrasea/queryParser.class.php
View File

@@ -122,6 +122,7 @@ class searchEngine_adapter_phrasea_queryParser
$this->proposals = Array("QRY" => "", "BASES" => array());
$this->phq = $this->mb_trim($phq, 'UTF-8');
if ($this->phq != "")
return($this->maketree(0));
else
{
@@ -139,14 +140,18 @@ class searchEngine_adapter_phrasea_queryParser
{
case "SIMPLE":
if (is_array($tree["VALUE"]))
return(implode(" ", $tree["VALUE"]));
else
return($tree["VALUE"]);
break;
case "QSIMPLE":
if (is_array($tree["VALUE"]))
return("\"" . implode(" ", $tree["VALUE"]) . "\"");
else
return("\"" . $tree["VALUE"] . "\"");
break;
case "PHRASEA_KW_ALL":
@@ -154,15 +159,19 @@ class searchEngine_adapter_phrasea_queryParser
break;
case "PHRASEA_KW_LAST":
if ($tree["PNUM"] !== null)
return("" . $tree["VALUE"][0] . "[" . $tree["PNUM"] . "]");
else
return($tree["VALUE"][0]);
break;
case "OPS":
case "OPK":
if (isset($tree["PNUM"]))
return("(" . $this->astext($tree["LB"]) . " " . $tree["VALUE"] . "[" . $tree["PNUM"] . "] " . $this->astext($tree["RB"]) . ")");
else
return("(" . $this->astext($tree["LB"]) . " " . $tree["VALUE"] . " " . $this->astext($tree["RB"]) . ")");
break;
}
@@ -183,8 +192,10 @@ class searchEngine_adapter_phrasea_queryParser
if ($tree)
{
if ($tree["CLASS"] == "OPS" || $tree["CLASS"] == "OPK")
return($tree["COMPLEXITY"] = $this->calc_complexity($tree["LB"]) + $this->calc_complexity($tree["RB"]));
else
return($tree["COMPLEXITY"] = 1);
}
}
@@ -348,6 +359,7 @@ class searchEngine_adapter_phrasea_queryParser
function priority_opk(&$tree, $depth = 0)
{
if (!$tree)
return;
if ($tree["CLASS"] == "OPK" && ($tree["LB"]["CLASS"] == "OPS" || $tree["LB"]["CLASS"] == "OPK"))
{
@@ -366,6 +378,7 @@ class searchEngine_adapter_phrasea_queryParser
function distrib_opk(&$tree, $depth = 0)
{
if (!$tree)
return;
if ($tree["CLASS"] == "OPK" && ($tree["RB"]["CLASS"] == "OPS"))
{
@@ -392,6 +405,7 @@ class searchEngine_adapter_phrasea_queryParser
function thesaurus2_apply(&$tree, $bid)
{
if (!$tree)
return;
if (($tree["CLASS"] == "SIMPLE" || $tree["CLASS"] == "QSIMPLE") && isset($tree["SREF"]) && isset($tree["SREF"]["TIDS"]))
{
@@ -458,6 +472,7 @@ class searchEngine_adapter_phrasea_queryParser
if ($depth == 0)
$ret = $tree;
if (!$useThesaurus)
return; // full-text only : inchangé
if (($tree["CLASS"] == "SIMPLE" || $tree["CLASS"] == "QSIMPLE"))
{
@@ -592,6 +607,7 @@ class searchEngine_adapter_phrasea_queryParser
$this->proposals["BASES"]["b$bid"] = array("BID" => $bid, "NAME" => $name, "TERMS" => array());
if (!$tree)
return(0);
$ambigus = 0;
@@ -632,7 +648,7 @@ class searchEngine_adapter_phrasea_queryParser
}
else
{
}
$tsy[$lng][] = $zsy;
}
@@ -733,15 +749,19 @@ class searchEngine_adapter_phrasea_queryParser
break;
case "PHRASEA_KW_LAST":
if ($tree["PNUM"] !== null)
return("" . $tree["VALUE"][0] . "[" . $tree["PNUM"] . "]");
else
return($tree["VALUE"][0]);
break;
case "OPS":
case "OPK":
if (isset($tree["PNUM"]))
return('(' . $this->_queryAsHTML($tree["LB"], $depth + 1) . ' ' . $tree["VALUE"] . '[' . $tree["PNUM"] . '] ' . $this->_queryAsHTML($tree["RB"], $depth + 1) . ')');
else
return('(' . $this->_queryAsHTML($tree["LB"], $depth + 1) . ' ' . $tree["VALUE"] . ' ' . $this->_queryAsHTML($tree["RB"], $depth + 1) . ')');
break;
}
@@ -904,8 +924,10 @@ class searchEngine_adapter_phrasea_queryParser
function containsColonOperator(&$tree)
{
if (!$tree)
return(false);
if ($tree["CLASS"] == "OPK" && $tree["NODETYPE"] == PHRASEA_OP_COLON && ($tree["RB"]["CLASS"] == "SIMPLE" || $tree["RB"]["CLASS"] == "QSIMPLE"))
return(true);
$ret = false;
if ($tree["CLASS"] == "OPS" || $tree["CLASS"] == "OPK")
@@ -1028,15 +1050,19 @@ class searchEngine_adapter_phrasea_queryParser
break;
case "PHRASEA_KW_LAST":
if ($tree["PNUM"] !== null)
return("" . $tree["VALUE"][0] . "[" . $tree["PNUM"] . "]");
else
return($tree["VALUE"][0]);
break;
case "OPS":
case "OPK":
if (isset($tree["PNUM"]))
return("(" . $this->astext_ambigu($tree["LB"], $ambiguites, $mouseCallback, $depth + 1) . " " . $tree["VALUE"] . "[" . $tree["PNUM"] . "] " . $this->astext_ambigu($tree["RB"], $ambiguites, $mouseCallback, $depth + 1) . ")");
else
return("(" . $this->astext_ambigu($tree["LB"], $ambiguites, $mouseCallback, $depth + 1) . " " . $tree["VALUE"] . " " . $this->astext_ambigu($tree["RB"], $ambiguites, $mouseCallback, $depth + 1) . ")");
break;
}
@@ -1045,6 +1071,7 @@ class searchEngine_adapter_phrasea_queryParser
function get_ambigu(&$tree, $mouseCallback = "void", $depth = 0)
{
if (!$tree)
return("");
unset($tree["DEPTH"]);
if ($tree["CLASS"] == "OPS" || $tree["CLASS"] == "OPK")
@@ -1054,7 +1081,7 @@ class searchEngine_adapter_phrasea_queryParser
}
else
{
}
if ($depth == 0)
{
@@ -1069,14 +1096,17 @@ class searchEngine_adapter_phrasea_queryParser
function set_default(&$tree, &$emptyw, $depth = 0)
{
if (!$tree)
return(true);
if ($tree["CLASS"] == "OPS" || $tree["CLASS"] == "OPK")
{
if ($tree["CLASS"] == "OPS")
{
if (!$this->set_default($tree["LB"], $emptyw, $depth + 1))
return(false);
if (!$this->set_default($tree["RB"], $emptyw, $depth + 1))
return(false);
}
else // OPK !
@@ -1210,6 +1240,7 @@ class searchEngine_adapter_phrasea_queryParser
$nmodif += $this->factor_or2($tree["RB"], $depth + 1);
}
}
return($nmodif);
}
@@ -1607,6 +1638,7 @@ class searchEngine_adapter_phrasea_queryParser
// quand on est entre guillements les tokens perdent leur signification
$tree = $this->addtotree($tree, $t, $depth, $inquote);
if (!$tree)
return(null);
}
else
@@ -1629,6 +1661,7 @@ class searchEngine_adapter_phrasea_queryParser
// quand on est entre guillements les tokens perdent leur signification
$tree = $this->addtotree($tree, $t, $depth, $inquote);
if (!$tree)
return(null);
}
else // '(' : appel récursif
@@ -1656,6 +1689,7 @@ class searchEngine_adapter_phrasea_queryParser
}
}
if (!$tree)
return(null);
}
break;
@@ -1712,6 +1746,7 @@ class searchEngine_adapter_phrasea_queryParser
}
}
if (!$tree)
return(null);
}
break;
@@ -1724,6 +1759,7 @@ class searchEngine_adapter_phrasea_queryParser
print("-------------------------\n");
}
if (!$tree)
return(null);
break;
}
@@ -1750,6 +1786,7 @@ class searchEngine_adapter_phrasea_queryParser
}
if (!$t)
return($tree);
switch ($t["CLASS"])
{
@@ -2009,6 +2046,7 @@ class searchEngine_adapter_phrasea_queryParser
function nexttoken($inquote = false)
{
if ($this->phq == "")
return(null);
switch ($c = substr($this->phq, 0, 1))
{
@@ -2143,8 +2181,10 @@ class searchEngine_adapter_phrasea_queryParser
$this->phq = $this->mb_ltrim(mb_substr($this->phq, $i + 1, 99999, 'UTF-8'), 'UTF-8');
}
if ($t != "")
return(array("CLASS" => "TOK_WORD", "VALUE" => $t));
else
return(array("CLASS" => "TOK_VOID", "VALUE" => $t));
break;
}

4
lib/classes/searchEngine/adapter/sphinx/engine.class.php
View File

@@ -752,9 +752,9 @@ class searchEngine_adapter_sphinx_engine extends searchEngine_adapter_abstract i
'before_match' => "<em>",
'after_match' => "</em>"
);
$fields_to_send = array();
foreach($fields as $k=>$f)
{
$fields_to_send[$k] = $f['value'];