scores/odea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge for correction

Browse Source
This commit is contained in:
Michael RICOIS 2012-10-05 14:31:51 +00:00
commit 74785d8b28
1 changed files with 81 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
library/Scores/Ciblage.php
View File

@ -112,7 +112,8 @@ class Ciblage
*/
protected function setFilterRange($name, $min, $max)
{
$this->sphinx->SetFilterRange($name, intval($min), intval($max));
Zend_Registry::get('firebug')->info($name.' - Min:'.$min.', Max:'.$max);
$this->sphinx->SetFilterRange($name, intval($min), intval($max));
}
/**
@ -250,8 +251,8 @@ class Ciblage
$valMax = $minmax->max;
}
$min = ($min===null) ? $valMin : $min;
$max = ($max===null) ? $valMax : $max;
$min = !is_int($min) ? $valMin : $min;
$max = !is_int($max) ? $valMax : $max;
return array(
'min' => $min,
@ -369,8 +370,10 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('nbActio', $value['in'][0], $value['in'][1]);
$result = $this->minmax('nbActio', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -382,8 +385,10 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('nbPart', $value['in'][0], $value['in'][1]);
$result = $this->minmax('nbPart', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -395,8 +400,10 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('nbMPubli', $value['in'][0], $value['in'][1]);
$result = $this->minmax('nbMPubli', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -408,8 +415,10 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('capital', $value['in'][0], $value['in'][1]);
$result = $this->minmax('capital', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -421,8 +430,10 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('age_entrep', $value['in'][0], $value['in'][1]);
$result = $this->minmax('age_entrep', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -434,7 +445,9 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('age_etab', $value['in'][0], $value['in'][1]);
$result = $this->minmax('age_etab', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -468,8 +481,10 @@ class Ciblage
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('eff_etab', $value['in'][0], $value['in'][1]);
$result = $this->minmax('eff_etab', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -482,10 +497,10 @@ class Ciblage
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('eff_entrep', $value['in'][0], $value['in'][1]);
Zend_Registry::get('firebug')->info('Min : '.$min.', Max : '.$max);
$result = $this->minmax('eff_entrep', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -497,8 +512,10 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('nbEtab', $value['in'][0], $value['in'][1]);
$result = $this->minmax('nbEtab', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -649,7 +666,9 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('bilEE', $value['in'][0], $value['in'][1]);
$result = $this->minmax('bilEE', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -662,8 +681,10 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('bilFL', $value['in'][0], $value['in'][1]);
$result = $this->minmax('bilFL', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -675,8 +696,10 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('bilFK', $value['in'][0], $value['in'][1]);
$result = $this->minmax('bilFK', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -688,8 +711,10 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('bilFR', $value['in'][0], $value['in'][1]);
$result = $this->minmax('bilFR', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -701,7 +726,9 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('bilGF', $value['in'][0], $value['in'][1]);
$result = $this->minmax('bilGF', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -714,7 +741,9 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('bilGP', $value['in'][0], $value['in'][1]);
$result = $this->minmax('bilGP', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -727,7 +756,9 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('bilGW', $value['in'][0], $value['in'][1]);
$result = $this->minmax('bilGW', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -740,7 +771,9 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('bilHD', $value['in'][0], $value['in'][1]);
$result = $this->minmax('bilHD', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -753,7 +786,9 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('bilHH', $value['in'][0], $value['in'][1]);
$result = $this->minmax('bilHH', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -766,7 +801,9 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('bilHL', $value['in'][0], $value['in'][1]);
$result = $this->minmax('bilHL', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -779,7 +816,9 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('bilHM', $value['in'][0], $value['in'][1]);
$result = $this->minmax('bilHM', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -792,7 +831,9 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('bilHN', $value['in'][0], $value['in'][1]);
$result = $this->minmax('bilHN', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;
@ -805,7 +846,9 @@ class Ciblage
{
if ( array_key_exists('in', $value) ) {
list($min, $max) = $this->minmax('bilYP', $value['in'][0], $value['in'][1]);
$result = $this->minmax('bilYP', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
if ($min===null || $max===null)
return;