// addFeatureValueImport partial fix

This commit is contained in:
Damien Metzger
2013-10-03 12:24:35 +02:00
parent 3585bf33c8
commit 6e0c3e1aa2
+18 -25
View File
@@ -128,34 +128,27 @@ class FeatureValueCore extends ObjectModel
return $tab['value']; return $tab['value'];
} }
public static function addFeatureValueImport($id_feature, $name) public static function addFeatureValueImport($id_feature, $value)
{ {
$rq = Db::getInstance()->executeS(' $id_feature_value = Db::getInstance()->getValue('
SELECT fv.`id_feature_value` SELECT fv.`id_feature_value`
FROM '._DB_PREFIX_.'feature_value fv FROM '._DB_PREFIX_.'feature_value fv
LEFT JOIN '._DB_PREFIX_.'feature_value_lang fvl LEFT JOIN '._DB_PREFIX_.'feature_value_lang fvl ON (fvl.`id_feature_value` = fv.`id_feature_value`)
ON (fvl.`id_feature_value` = fv.`id_feature_value`) WHERE `value` = \''.pSQL($value).'\'
WHERE `value` = \''.pSQL($name).'\' AND fv.`id_feature` = '.(int)$id_feature.'
AND fv.`id_feature` = '.(int)$id_feature.' GROUP BY fv.`id_feature_value`');
GROUP BY fv.`id_feature_value` LIMIT 1 if ($id_feature_value)
'); return (int)$id_feature_value;
if (!isset($rq[0]['id_feature_value']) || !$id_feature_value = (int)$rq[0]['id_feature_value']) // Feature doesn't exist, create it
{ $feature_value = new FeatureValue();
// Feature doesn't exist, create it $feature_value->id_feature = (int)$id_feature;
$feature_value = new FeatureValue(); $feature_value->custom = 0;
foreach (Language::getLanguages() as $language)
$feature_value->value[$language['id_lang']] = $value;
$feature_value->add();
$languages = Language::getLanguages(); return (int)$feature_value->id;
foreach ($languages as $language)
$feature_value->value[$language['id_lang']] = strval($name);
$feature_value->id_feature = (int)$id_feature;
$feature_value->custom = 1;
$feature_value->add();
return (int)$feature_value->id;
}
return (int)$id_feature_value;
} }
public function add($autodate = true, $nullValues = false) public function add($autodate = true, $nullValues = false)