From 71111ecec1b9a27301438ef4a3da88181c2a3888 Mon Sep 17 00:00:00 2001
From: Patrick Barroca <pbarroca@afi-sa.fr>
Date: Thu, 15 Nov 2018 15:49:35 +0100
Subject: [PATCH] dev #74784 : fix RT
---
FEATURES/74784 | 4 +-
.../opac/controllers/RechercheController.php | 70 +++++++++++++------
library/Class/FRBR/Link.php | 23 ++++++
library/Class/FRBR/LinkType.php | 11 +++
library/Class/Notice.php | 5 +-
library/Class/Notice/JsonVisitor.php | 6 +-
6 files changed, 85 insertions(+), 34 deletions(-)
diff --git a/FEATURES/74784 b/FEATURES/74784
index c2c8ee21278..6474a9e1a94 100644
--- a/FEATURES/74784
+++ b/FEATURES/74784
@@ -5,6 +5,6 @@
'Video' => '',
'Category' => $this->_('API / Open data'),
'Right' => function($feature_description, $user) {return true;},
- 'Wiki' => '',
- 'Test' => '',
+ 'Wiki' => 'http://wiki.bokeh-library-portal.org/index.php?title=Recherche_en_JSON',
+ 'Test' => ($record = Class_Notice::findFirstBy([])) ? $record->getAbsoluteUrl() : '',
'Date' => '2018-11-14'],
\ No newline at end of file
diff --git a/application/modules/opac/controllers/RechercheController.php b/application/modules/opac/controllers/RechercheController.php
index 5f405eaba02..fa210e3781e 100644
--- a/application/modules/opac/controllers/RechercheController.php
+++ b/application/modules/opac/controllers/RechercheController.php
@@ -301,28 +301,20 @@ class RechercheController extends ZendAfi_Controller_Action {
public function viewnoticeAction() {
$id_notice = (int)$this->_getParam('id');
- $clef_alpha = $this->_getParam('clef');
-
- if ($clef_alpha
- && ($notices = Class_Notice::getAllNoticesByClefAlpha($clef_alpha))) {
- if (!$id_notice && (count($notices) > 1)) {
- $query = implode(' ', array_filter(array_slice(explode('-', $clef_alpha), 0, 3)));
- $this->_redirect('/opac/recherche?'.http_build_query(['q' => $query]));
- return;
- }
+ $clef_alpha = (string)$this->_getParam('clef');
- $ids = array_map(
- function($notice) {
- return $notice->getId();
- },
- $notices);
+ $result = $this->_findRecordByKeyOrId($clef_alpha, $id_notice);
- if (!in_array($id_notice, $ids))
- $id_notice = array_pop($notices)->getId();
+ if ($result->isTooManyResults()) {
+ $query = implode(' ', array_filter(array_slice(explode('-', $clef_alpha), 0, 3)));
+ $this->_helper->notify($this->_('Plusieurs documents trouvés'));
+ return $this->_redirect('/opac/recherche?'.http_build_query(['q' => $query]));
}
- if (!$notice = Class_Notice::find($id_notice))
+ if (!$notice = $result->getRecord()) {
+ $this->_helper->notify($this->_('Document introuvable'));
return $this->_redirect('opac/recherche/simple');
+ }
Class_ScriptLoader::getInstance()->addRecordMeta($notice);
@@ -411,8 +403,9 @@ class RechercheController extends ZendAfi_Controller_Action {
public function jsonRecordAction() {
$this->_helper->getHelper('viewRenderer')->setNoRender();
- ($record = $this->_findRecordByKeyOrId((string)$this->_getParam('clef'),
- (int)$this->_getParam('id')))
+ $result = $this->_findRecordByKeyOrId((string)$this->_getParam('clef'),
+ (int)$this->_getParam('id'));
+ ($record = $result->getRecord())
? $this->_helper->json($record
->acceptVisitor(new Class_Notice_JsonVisitor())
->data())
@@ -421,17 +414,19 @@ class RechercheController extends ZendAfi_Controller_Action {
protected function _findRecordByKeyOrId($key, $id) {
+ $result = new RechercheController_FindRecordByKeyOrIdResult();
+
if (!$key || (!$records = Class_Notice::getAllNoticesByClefAlpha($key)))
- return Class_Notice::find($id);
+ return $result->setRecord(Class_Notice::find($id));
if (!$id && (count($records) > 1))
- return;
+ return $result->beTooManyResults();
foreach($records as $record)
if ($id == $record->getId())
- return $record;
+ return $result->setRecord($record);
- return array_pop($records);
+ return $result->setRecord(array_pop($records));
}
@@ -841,4 +836,33 @@ class RechercheController extends ZendAfi_Controller_Action {
$ig->addButton(new Class_Entity(['Label' => $this->_('Dilicom'),
'Content' => $this->view->notice_Dilicom($record)]));
}
+}
+
+
+
+class RechercheController_FindRecordByKeyOrIdResult {
+ protected
+ $_record,
+ $_too_many_results = false;
+
+ public function setRecord($record) {
+ $this->_record = $record;
+ return $this;
+ }
+
+
+ public function getRecord() {
+ return $this->_record;
+ }
+
+
+ public function beTooManyResults() {
+ $this->_to_many_results = true;
+ return $this;
+ }
+
+
+ public function isTooManyResults() {
+ return $this->_to_many_results;
+ }
}
\ No newline at end of file
diff --git a/library/Class/FRBR/Link.php b/library/Class/FRBR/Link.php
index a110fbee7cb..0048ababcc5 100644
--- a/library/Class/FRBR/Link.php
+++ b/library/Class/FRBR/Link.php
@@ -42,6 +42,29 @@ class FRBR_LinkLoader extends Storm_Model_Loader {
}
+ public function findByAnyKey($key) {
+ $models = [];
+
+ foreach(Class_FRBR_Link::findBySourceKey($key) as $link)
+ $models[$link->getId()] = $link;
+
+ foreach(Class_FRBR_Link::findByTargetKey($key) as $link)
+ $models[$link->getId()] = $link;
+
+ return $models;
+ }
+
+
+ public function findBySourceKey($key) {
+ return Class_FRBR_Link::findAllBy(['source_key' => $key, 'order' => 'type_id']);
+ }
+
+
+ public function findByTargetKey($key) {
+ return Class_FRBR_Link::findAllBy(['target_key' => $key, 'order' => 'type_id']);
+ }
+
+
/**
* @param $name string
* @param $value string
diff --git a/library/Class/FRBR/LinkType.php b/library/Class/FRBR/LinkType.php
index 4abaf511c13..e1514ee461f 100644
--- a/library/Class/FRBR/LinkType.php
+++ b/library/Class/FRBR/LinkType.php
@@ -70,4 +70,15 @@ class Class_FRBR_LinkType extends Storm_Model_Abstract {
->validateAttribute('from_source', 'Zend_Validate_NotEmpty', $this->_('Un libellé de l\'objet A vers l\'objet B est requis'))
->validateAttribute('from_target', 'Zend_Validate_NotEmpty', $this->_('Un libellé de l\'objet B vers l\'objet A est requis'));
}
+
+
+ public function forJson() {
+ $relation = new StdClass();
+ $relation->id = $this->getId();
+ $relation->label = $this->getLibelle();
+ $relation->from_source = $this->getFromSource();
+ $relation->from_target = $this->getFromTarget();
+
+ return $relation;
+ }
}
diff --git a/library/Class/Notice.php b/library/Class/Notice.php
index 9bd4728f629..f195ceba8d9 100644
--- a/library/Class/Notice.php
+++ b/library/Class/Notice.php
@@ -1584,10 +1584,7 @@ class Class_Notice extends Storm_Model_Abstract {
$visitor->visitGenres($this->getGenres());
$visitor->visitItems($this); // $this to prevent call on getExemplaires here and overload requests
- foreach(Class_FRBR_Link::getLinksFor('source', $this->getClefAlpha()) as $link)
- $visitor->visitFrbrLink($link);
-
- foreach(Class_FRBR_Link::getLinksFor('target', $this->getClefAlpha()) as $link)
+ foreach(Class_FRBR_Link::findByAnyKey($this->getClefAlpha()) as $link)
$visitor->visitFrbrLink($link);
return $visitor;
diff --git a/library/Class/Notice/JsonVisitor.php b/library/Class/Notice/JsonVisitor.php
index 178b24563f8..5e036d5153c 100644
--- a/library/Class/Notice/JsonVisitor.php
+++ b/library/Class/Notice/JsonVisitor.php
@@ -149,11 +149,7 @@ class Class_Notice_JsonVisitor {
if ($relation->id === $type->getId())
return $relation;
- $relation = new StdClass();
- $relation->id = $type->getId();
- $relation->label = $type->getLibelle();
- $relation->from_source = $type->getFromSource();
- $relation->from_target = $type->getFromTarget();
+ $relation = $type->forJson();
$relation->entries = [];
$this->_data->relations[] = $relation;
--
GitLab