Citations return type as object (class) instead of array

GaziYucel · May 21, 2024 · a2235b5 · a2235b5
1 parent d3a3cad
commit a2235b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/classes/Db/PluginDAO.php b/classes/Db/PluginDAO.php
@@ -44,16 +44,13 @@ public function getCitations(Publication|null $publication): array
             true
         );
 
-        if (empty($citationsIn) || json_last_error() !== JSON_ERROR_NONE)
-            return [];
+        if (empty($citationsIn) || json_last_error() !== JSON_ERROR_NONE) return [];
 
         $citationsOut = [];
 
         foreach ($citationsIn as $citation) {
-            if (!empty($citation) && (is_object($citation) || is_array($citation))) {
-                $citationsOut[] =
-                    ClassHelper::getClassAsArrayWithValuesAssigned(new CitationModel(), $citation);
-            }
+            if (!empty($citation) && (is_object($citation) || is_array($citation)))
+                $citationsOut[] = ClassHelper::getClassWithValuesAssigned(new CitationModel(), $citation);
         }
 
         return $citationsOut;

diff --git a/classes/FrontEnd/ArticleView.php b/classes/FrontEnd/ArticleView.php
@@ -125,9 +125,9 @@ public function getCitationsAsHtml(int $publicationId): string
 
         $count = count($citations);
         for ($i = 0; $i < $count; $i++) {
-            $citationOut = $this->getCitationWithLinks($citations[$i]['raw']);
+            $citationOut = $this->getCitationWithLinks($citations[$i]->raw);
 
-            if ($citations[$i]['isProcessed']) $citationOut = $this->getSingleCitationAsHtml($citations[$i]);
+            if ($citations[$i]->isProcessed) $citationOut = $this->getSingleCitationAsHtml($citations[$i]);
 
             $output .= '<p>' . $citationOut . '</p>';
         }
@@ -178,7 +178,7 @@ public function getSingleCitationAsHtml($citation): string
 
         // authors
         $orcidUrl = "<a href='" . Orcid::prefix . "/{orcid}' target='_blank' class=''><span>{name}</span></a>";
-        foreach ($citation['authors'] as $author) {
+        foreach ($citation->authors as $author) {
             if (!empty($author['orcid_id'])) {
                 $out .= " " . str_replace(
                         ['{orcid}', '{name}'],
@@ -198,9 +198,9 @@ public function getSingleCitationAsHtml($citation): string
         $wikiDataUrl = "<a href='" . Wikidata::prefix . "/{wikidata_id}' target='_blank' class='citationManager-Button citationManager-ButtonGreen'><span>Wikidata</span></a>";
         $openAlexUrl = "<a href='" . OpenAlex::prefix . "/{openalex_id}' target='_blank' class='citationManager-Button citationManager-ButtonGreen'><span>OpenAlex</span></a>";
 
-        if (!empty($citation['doi'])) $out .= " " . str_replace('{doi}', $citation['doi'], $doiUrl);
-        if (!empty($citation['wikidata_id'])) $out .= " " . str_replace('{wikidata_id}', $citation['wikidata_id'], $wikiDataUrl);
-        if (!empty($citation['openalex_id'])) $out .= " " . str_replace('{openalex_id}', $citation['openalex_id'], $openAlexUrl);
+        if (!empty($citation->doi)) $out .= " " . str_replace('{doi}', $citation->doi, $doiUrl);
+        if (!empty($citation->wikidata_id)) $out .= " " . str_replace('{wikidata_id}', $citation->wikidata_id, $wikiDataUrl);
+        if (!empty($citation->openalex_id)) $out .= " " . str_replace('{openalex_id}', $citation->openalex_id, $openAlexUrl);
 
         $out .= '<!-- structured -->';