Merge branch 'instance/fid' into instance/fid_adlr

module/finc/src/finc/Recommend/EbscoResults.php

@@ -166,12 +166,17 @@ class EbscoResults implements
 
         if (!$results->isSuccess()) {
             $this->results = false;
+            return;
         }
         $this->results = $this->sortByHits(
             json_decode($results->getBody(), true)
         );
         if (json_last_error() !== JSON_ERROR_NONE) {
-            throw new \Exception('JSON type error ' . json_last_error_msg());
+            $this->debug(
+                'JSON type error "'
+                . json_last_error_msg().'"'
+                . (empty($results->getBody()) ? '. EBSCO result was empty.' : '')
+            );
         }
     }
 

module/finc/src/finc/View/Helper/Root/ResultFeed.php

@@ -54,18 +54,12 @@ class ResultFeed extends \VuFind\View\Helper\Root\ResultFeed
     protected function addEntry($feed, $record)
     {
         $entry = $feed->createEntry();
-        $title = $record->tryMethod('getTitle');
-        $publishPlace = $record->tryMethod('getPlacesOfPublication');
-        if (!empty($publishPlace)) {
-            $title .= ' / ' . implode(', ', $publishPlace);
-        }
-        $publisher = $record->tryMethod('getPublishers');
-        if (!empty($publisher) && is_array($publisher)) {
-            $title .= ' / ' . implode(', ', $publisher);
-        }
-        $publishDateSort = $record->tryMethod('getPublishDateSort');
-        if (!empty($publishDateSort)) {
-            $title .= ' / ' . $publishDateSort;
+        $helper = $this->getView()->citation($record);
+        $recordtype = $record->getRecordType();
+        if ($recordtype == 'ai') {
+            $title = $helper->getCitation('APAAI');
+        } else {
+            $title = $helper->getCitation('APA');
         }
         $entry->setTitle(empty($title) ? $record->getBreadcrumb() : $title);
         $serverUrl = $this->getView()->plugin('serverurl');
@@ -85,21 +79,6 @@ class ResultFeed extends \VuFind\View\Helper\Root\ResultFeed
         if (!empty($date)) {
             $entry->setDateModified($date);
         }
-        $author = $record->tryMethod('getPrimaryAuthor');
-        if (!empty($author)) {
-            $entry->addAuthor(['name' => $author]);
-        }
-        /*$formats = $record->tryMethod('getFormats');
-        if (is_array($formats)) {
-            foreach ($formats as $format) {
-                $entry->addDCFormat($format);
-            }
-        }
-        $dcDate = $this->getDcDate($record);
-        if (!empty($dcDate)) {
-            $entry->setDCDate($dcDate);
-        }*/
-
         $feed->addEntry($entry);
     }