Skip to content
Snippets Groups Projects

Master

Merged Ghost User requested to merge master into WIP
Compare and
+ 22
18
Preferences
Compare changes
Files
@@ -173,8 +173,8 @@ class CatalogueLoader extends Storm_Model_Loader {
$parts = array_filter(explode(';', $docType));
return (1 == count($parts)) ?
('type_doc=' . $parts[0]) :
('type_doc IN (' . implode(', ', $parts) . ')');
('notices.type_doc=' . $parts[0]) :
('notices.type_doc IN (' . implode(', ', $parts) . ')');
}
@@ -322,7 +322,7 @@ class CatalogueLoader extends Storm_Model_Loader {
return ['req_liste' => sprintf($sql, $fields ? implode(',', $fields) : '*')
. $order_by . $limite,
'req_comptage' => sprintf($sql, 'count(*)'),
'req_facettes' => sprintf($sql, 'notices.id_notice, type_doc, facettes')
'req_facettes' => sprintf($sql, 'notices.id_notice, notices.type_doc, facettes')
. $limite,
'req_ids' => sprintf($sql, 'notices.id_notice') . $order_by . $limite];
}
@@ -466,7 +466,7 @@ class CatalogueLoader extends Storm_Model_Loader {
return ['req_liste' => sprintf($sql, '*') . $order_by . $limite,
'req_comptage' => sprintf($sql, 'count(*)'),
'req_facettes' => sprintf($sql, 'id_notice, type_doc, facettes') . $limite,
'req_facettes' => sprintf($sql, 'id_notice, notices.type_doc, facettes') . $limite,
'req_ids' => sprintf($sql, 'notices.id_notice') . $order_by . $limite];
}
@@ -703,7 +703,7 @@ class Class_Catalogue extends Storm_Model_Abstract {
*/
$query =
'update notices set facettes = clean_spaces(replace(facettes,"H'.$id_thesaurus.'","")) '.
'where type_doc not in ('.implode(',', [Class_TypeDoc::ARTICLE, Class_TypeDoc::RSS, Class_TypeDoc::SITE]).') '.
'where notices.type_doc not in ('.implode(',', [Class_TypeDoc::ARTICLE, Class_TypeDoc::RSS, Class_TypeDoc::SITE]).') '.
'and match(facettes) against("+H'.$id_thesaurus.'" in boolean mode)';
Zend_Registry::get('sql')->query($query);