Adapt to new Solr config :

- category -> genre
- cover in solr
- producer -> producerCode
This commit is contained in:
Gilles Crettenand
2015-05-29 11:01:24 +02:00
parent 28b4b8a985
commit f9c85c73dd
3 changed files with 15 additions and 23 deletions

View File

@@ -310,7 +310,7 @@ class NetBiblio extends WebService
if (isset($queryArray['queryType'])) {
$bs->addSortField('author', SolrQuery::ORDER_ASC);
$bs->addSortField('title', SolrQuery::ORDER_ASC);
$bs->addSortField('producer');
$bs->addSortField('producerCode');
$bs->addSortField('mediaType', SolrQuery::ORDER_ASC);
} else {
$bs->addSortField('availabilityDate');
@@ -323,15 +323,15 @@ class NetBiblio extends WebService
$bs->addQuery($queryArray['queryText'], $type);
}
if(isset($queryArray['category']) && is_array($queryArray['category'])) {
$selectedCategories = array_filter($queryArray['category'], function ($c) {
if(isset($queryArray['genre']) && is_array($queryArray['genre'])) {
$selectedGenres = array_filter($queryArray['genre'], function ($c) {
return $c != '0';
});
if (count($selectedCategories) > 0) {
$selectedCategories = array_map(function ($c) {
return 'categoryCode:'.SolrUtils::escapeQueryChars($c);
}, $selectedCategories);
$bs->addQuery('('.implode(' OR ', $selectedCategories).')', null, false);
if (count($selectedGenres) > 0) {
$selectedGenres = array_map(function ($c) {
return 'genreCode:'.SolrUtils::escapeQueryChars($c);
}, $selectedGenres);
$bs->addQuery('('.implode(' OR ', $selectedGenres).')', null, false);
}
}
@@ -354,10 +354,7 @@ class NetBiblio extends WebService
);
foreach ($results['response']['docs'] as $doc) {
$book = AudioBook::findBy('NoticeID', $doc['id'], true);
if($book) {
$data[] = $this->AddFiles($book);
}
$data[] = $this->AddFiles($doc);
}
return $data;
@@ -368,9 +365,9 @@ class NetBiblio extends WebService
return AudioBook::listOfReaders();
}
public function ListOfCategories()
public function ListOfGenres()
{
return AudioBook::listOfCategories();
return AudioBook::ListOfGenres();
}
public function ListOfTypes()
@@ -393,7 +390,7 @@ class NetBiblio extends WebService
if($type == 'Jeunesse') {
$s->addQuery(1, 'jeunesse');
} else {
$s->addQuery($type, 'category');
$s->addQuery($type, 'genre');
}
$s->addSortField('availabilityDate');