- {% for field_id, field in search_datas['dates'] %}
+ {% for field in app['phraseanet.SE'].getAvailableDateFields() %}
{{field['fieldname']}}
+ class="" value="{{ field }}">{{ field }}
{% endfor %}
-
+
{% trans 'rechercher dans tous les champs' %}
diff --git a/tests/Alchemy/Phrasea/SearchEngine/SearchEngineAbstractTest.php b/tests/Alchemy/Phrasea/SearchEngine/SearchEngineAbstractTest.php
index 38b7835b66..3a320ed901 100644
--- a/tests/Alchemy/Phrasea/SearchEngine/SearchEngineAbstractTest.php
+++ b/tests/Alchemy/Phrasea/SearchEngine/SearchEngineAbstractTest.php
@@ -8,6 +8,8 @@ require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.i
abstract class SearchEngineAbstractTest extends \PhraseanetPHPUnitAuthenticatedAbstract
{
+
+ protected $options;
protected static $searchEngine;
protected static $initialized = false;
@@ -66,8 +68,18 @@ abstract class SearchEngineAbstractTest extends \PhraseanetPHPUnitAuthenticatedA
$options = new SearchEngineOptions();
$options->onCollections($databox->get_collections());
+ $this->options = $options;
+
self::$searchEngine->setOptions($options);
}
+
+ /**
+ * @return SearchEngineOptions
+ */
+ private function getOptions()
+ {
+ return $this->options;
+ }
abstract public function initialize();
@@ -83,7 +95,7 @@ abstract class SearchEngineAbstractTest extends \PhraseanetPHPUnitAuthenticatedA
self::$searchEngine->addRecord($record);
$this->updateIndex();
-
+
self::$searchEngine->resetCache();
$results = self::$searchEngine->query($query_string, 0, 1);
$this->assertEquals(1, $results->total());
@@ -101,7 +113,7 @@ abstract class SearchEngineAbstractTest extends \PhraseanetPHPUnitAuthenticatedA
self::$searchEngine->addRecord($record);
$this->updateIndex();
-
+
self::$searchEngine->resetCache();
$results = self::$searchEngine->query($query_string, 0, 1);
$this->assertEquals(1, $results->total());
@@ -114,22 +126,141 @@ abstract class SearchEngineAbstractTest extends \PhraseanetPHPUnitAuthenticatedA
public function testQueryByDateMin()
{
- $this->markTestSkipped('No yet implemented');
+ $record = self::$DI['record_24'];
+ $query_string = 'boomboklot' . $record->get_record_id() . 'dateMin';
+
+ $this->editRecord($query_string, $record);
+
+ $date_field = $this->editDateRecord('2012-12-21 12:12:00', $record);
+
+ if (!$date_field) {
+ $this->markTestSkipped('unable to add a date to record');
+ }
+
+ self::$searchEngine->addRecord($record);
+ $this->updateIndex();
+
+ $options = $this->getOptions();
+ $options->setDateFields(array($date_field));
+ $options->setMinDate(\DateTime::createFromFormat('Y-m-d H:i:s', '2012-12-23 01:01:00'));
+ self::$searchEngine->setOptions($options);
+
+ self::$searchEngine->resetCache();
+ $results = self::$searchEngine->query($query_string, 0, 1);
+ $this->assertEquals(0, $results->total());
+
+ $options->setMinDate(\DateTime::createFromFormat('Y-m-d H:i:s', '2012-12-20 01:01:00'));
+ self::$searchEngine->setOptions($options);
+
+ self::$searchEngine->resetCache();
+ $results = self::$searchEngine->query($query_string, 0, 1);
+ $this->assertEquals(1, $results->total());
+ }
+
+ private function editDateRecord($date, \record_adapter $record)
+ {
+ $date_field = null;
+
+ foreach ($record->get_databox()->get_meta_structure() as $databox_field) {
+ if ($databox_field->get_type() != \databox_field::TYPE_DATE) {
+ continue;
+ }
+
+ $date_field = $databox_field;
+
+ break;
+ }
+
+ if ($date_field) {
+
+ $toupdate = array();
+
+ try {
+ $values = $record->get_caption()->get_field($databox_field->get_name())->get_values();
+ $value = array_pop($values);
+ $meta_id = $value->getId();
+ } catch (\Exception $e) {
+ $meta_id = null;
+ }
+
+ $toupdate[$databox_field->get_id()] = array(
+ 'meta_id' => $meta_id
+ , 'meta_struct_id' => $databox_field->get_id()
+ , 'value' => $date
+ );
+
+ $record->set_metadatas($toupdate);
+ }
+
+
+ return $date_field;
}
public function testQueryByDateMax()
{
- $this->markTestSkipped('No yet implemented');
+ $record = self::$DI['record_24'];
+ $query_string = 'boomboklot' . $record->get_record_id() . 'dateMax';
+
+ $this->editRecord($query_string, $record);
+
+ $date_field = $this->editDateRecord('2012-12-21 12:12:00', $record);
+
+ if (!$date_field) {
+ $this->markTestSkipped('unable to add a date to record');
+ }
+
+ self::$searchEngine->addRecord($record);
+ $this->updateIndex();
+
+ $options = $this->getOptions();
+ $options->setDateFields(array($date_field));
+ $options->setMaxDate(\DateTime::createFromFormat('Y-m-d H:i:s', '2012-12-20 01:01:00'));
+ self::$searchEngine->setOptions($options);
+
+ self::$searchEngine->resetCache();
+ $results = self::$searchEngine->query($query_string, 0, 1);
+ $this->assertEquals(0, $results->total());
+
+ $options->setMaxDate(\DateTime::createFromFormat('Y-m-d H:i:s', '2012-12-23 01:01:00'));
+ self::$searchEngine->setOptions($options);
+
+ self::$searchEngine->resetCache();
+ $results = self::$searchEngine->query($query_string, 0, 1);
+ $this->assertEquals(1, $results->total());
}
public function testQueryByDateRange()
{
- $this->markTestSkipped('No yet implemented');
- }
+ $record = self::$DI['record_24'];
+ $query_string = 'boomboklot' . $record->get_record_id() . 'dateRange';
- public function testQueryInField()
- {
- $this->markTestSkipped('No yet implemented');
+ $this->editRecord($query_string, $record);
+
+ $date_field = $this->editDateRecord('2012-12-21 12:12:00', $record);
+
+ if (!$date_field) {
+ $this->markTestSkipped('unable to add a date to record');
+ }
+
+ self::$searchEngine->addRecord($record);
+ $this->updateIndex();
+
+ $options = $this->getOptions();
+ $options->setDateFields(array($date_field));
+ $options->setMinDate(\DateTime::createFromFormat('Y-m-d H:i:s', '2012-12-18 01:01:00'));
+ $options->setMaxDate(\DateTime::createFromFormat('Y-m-d H:i:s', '2012-12-20 01:01:00'));
+ self::$searchEngine->setOptions($options);
+
+ self::$searchEngine->resetCache();
+ $results = self::$searchEngine->query($query_string, 0, 1);
+ $this->assertEquals(0, $results->total());
+
+ $options->setMaxDate(\DateTime::createFromFormat('Y-m-d H:i:s', '2012-12-22 01:01:00'));
+ self::$searchEngine->setOptions($options);
+
+ self::$searchEngine->resetCache();
+ $results = self::$searchEngine->query($query_string, 0, 1);
+ $this->assertEquals(1, $results->total());
}
protected function editRecord($string2add, \record_adapter &$record, $indexable = true, $business = false)
diff --git a/tests/Alchemy/Phrasea/SearchEngine/SphinxSearchEngineTest.php b/tests/Alchemy/Phrasea/SearchEngine/SphinxSearchEngineTest.php
index 789d9ca985..68b13d730a 100644
--- a/tests/Alchemy/Phrasea/SearchEngine/SphinxSearchEngineTest.php
+++ b/tests/Alchemy/Phrasea/SearchEngine/SphinxSearchEngineTest.php
@@ -23,7 +23,23 @@ class SphinxSearchEngineTest extends SearchEngineAbstractTest
self::$searchEngine = new SphinxSearchEngine($app, '127.0.0.1', 19306, '127.0.0.1', 19308);
self::$config = tempnam(sys_get_temp_dir(), 'tmp_sphinx.conf');
- $configFile = self::$searchEngine->configurationPanel()->generateSphinxConf($appbox->get_databoxes(), self::$searchEngine->configurationPanel()->getConfiguration());
+ $configuration = self::$searchEngine->configurationPanel()->getConfiguration();
+ $configuration['date_fields'] = array();
+
+ foreach($appbox->get_databoxes() as $databox) {
+ foreach ($databox->get_meta_structure() as $databox_field) {
+ if ($databox_field->get_type() != \databox_field::TYPE_DATE) {
+ continue;
+ }
+ $configuration['date_fields'][] = $databox_field->get_name();
+ }
+ }
+
+ $configuration['date_fields'] = array_unique($configuration['date_fields']);
+
+ self::$searchEngine->configurationPanel()->saveConfiguration($configuration);
+
+ $configFile = self::$searchEngine->configurationPanel()->generateSphinxConf($appbox->get_databoxes(), $configuration);
file_put_contents(self::$config, $configFile);
@@ -37,7 +53,7 @@ class SphinxSearchEngineTest extends SearchEngineAbstractTest
self::$searchd = new Process($searchd . ' -c ' . self::$config);
self::$searchd->run();
-
+
self::$searchEngine = new SphinxSearchEngine($app, '127.0.0.1', 19306, '127.0.0.1', 19308);
}
diff --git a/www/thesaurus2/export_topics.php b/www/thesaurus2/export_topics.php
index 2786bd41d9..4306131c30 100644
--- a/www/thesaurus2/export_topics.php
+++ b/www/thesaurus2/export_topics.php
@@ -53,9 +53,11 @@ $obr = explode(';', $parm['obr']);
$t_lng = array();
if ($parm['ofm'] == 'tofiles') {
- $t = User_Adapter::avLanguages();
- foreach ($t as $lng_code => $lng)
+ foreach (Application::getAvailableLanguages() as $lng_code => $lng) {
+ $lng_code = explode('_', $lng_code);
+ $lng_code = $lng_code[0];
$t_lng[] = $lng_code;
+ }
} else {
$t_lng[] = $parm['piv'];
}
diff --git a/www/thesaurus2/index.php b/www/thesaurus2/index.php
index 16733922ef..de1e9098c5 100644
--- a/www/thesaurus2/index.php
+++ b/www/thesaurus2/index.php
@@ -129,8 +129,9 @@ if ($nbases > 0) {
}
$nf = 0;
- $tlng = User_Adapter::avLanguages();
- foreach ($tlng as $lng_code => $lng) {
+ foreach (Application::getAvailableLanguages() as $lng_code => $lng) {
+ $lng_code = explode('_', $lng_code);
+ $lng_code = $lng_code[0];
printf(" \n");
$nf ++;
diff --git a/www/thesaurus2/newsy_dlg.php b/www/thesaurus2/newsy_dlg.php
index 078380b886..114c0b643c 100644
--- a/www/thesaurus2/newsy_dlg.php
+++ b/www/thesaurus2/newsy_dlg.php
@@ -97,8 +97,9 @@ switch ($parm["typ"]) {
![](/skins/lng/" . $lng_code . "_flag_18.gif)
(" . $lng_code . ")
\n", $lng_code, $lng_code);