From 1dbec01782df3216d34d2c530c527bc28364a8fc Mon Sep 17 00:00:00 2001
From: Arno Kaimbacher <arno.kaimbacher@geologie.ac.at>
Date: Mon, 25 May 2020 13:36:13 +0200
Subject: [PATCH] - change solr mapping of attribut 'id' do database attribute
 'publish_id' - composer updates - PagesController.php: query publish_id

---
 .../Controllers/Frontend/PagesController.php  |  3 +-
 composer.lock                                 | 46 +++++++++++--------
 public/solr.xslt                              |  2 +-
 .../views/frontend/dataset/show.blade.php     |  2 +-
 solr.xslt                                     |  2 +-
 5 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/app/Http/Controllers/Frontend/PagesController.php b/app/Http/Controllers/Frontend/PagesController.php
index c152a04..bbc688d 100644
--- a/app/Http/Controllers/Frontend/PagesController.php
+++ b/app/Http/Controllers/Frontend/PagesController.php
@@ -28,7 +28,8 @@ class PagesController extends Controller
      */
     public function show($id): View
     {
-        $dataset = Dataset::findOrFail($id);
+        //$dataset = Dataset::findOrFail($id);
+        $dataset = Dataset::where('publish_id', '=', $id)->firstOrFail();
         $dataset->load('titles');
         $dataset->load('abstracts');
 
diff --git a/composer.lock b/composer.lock
index 29411ec..cfcfb04 100755
--- a/composer.lock
+++ b/composer.lock
@@ -1351,20 +1351,20 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "2.0.2",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "c861fcba2ca29404dc9e617eedd9eff4616986b8"
+                "reference": "38914429aac460e8e4616c8cb486ecb40ec90bb1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c861fcba2ca29404dc9e617eedd9eff4616986b8",
-                "reference": "c861fcba2ca29404dc9e617eedd9eff4616986b8",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/38914429aac460e8e4616c8cb486ecb40ec90bb1",
+                "reference": "38914429aac460e8e4616c8cb486ecb40ec90bb1",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2",
+                "php": ">=7.2",
                 "psr/log": "^1.0.1"
             },
             "provide": {
@@ -1375,11 +1375,11 @@
                 "doctrine/couchdb": "~1.0@dev",
                 "elasticsearch/elasticsearch": "^6.0",
                 "graylog2/gelf-php": "^1.4.2",
-                "jakub-onderka/php-parallel-lint": "^0.9",
                 "php-amqplib/php-amqplib": "~2.4",
                 "php-console/php-console": "^3.1.3",
+                "php-parallel-lint/php-parallel-lint": "^1.0",
                 "phpspec/prophecy": "^1.6.1",
-                "phpunit/phpunit": "^8.3",
+                "phpunit/phpunit": "^8.5",
                 "predis/predis": "^1.1",
                 "rollbar/rollbar": "^1.3",
                 "ruflin/elastica": ">=0.90 <3.0",
@@ -1428,7 +1428,17 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2019-12-20T14:22:59+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/Seldaek",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-05-22T08:12:19+00:00"
         },
         {
             "name": "nesbot/carbon",
@@ -1567,16 +1577,16 @@
         },
         {
             "name": "opis/closure",
-            "version": "3.5.1",
+            "version": "3.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/opis/closure.git",
-                "reference": "93ebc5712cdad8d5f489b500c59d122df2e53969"
+                "reference": "2e3299cea6f485ca64d19c540f46d7896c512ace"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/opis/closure/zipball/93ebc5712cdad8d5f489b500c59d122df2e53969",
-                "reference": "93ebc5712cdad8d5f489b500c59d122df2e53969",
+                "url": "https://api.github.com/repos/opis/closure/zipball/2e3299cea6f485ca64d19c540f46d7896c512ace",
+                "reference": "2e3299cea6f485ca64d19c540f46d7896c512ace",
                 "shasum": ""
             },
             "require": {
@@ -1624,7 +1634,7 @@
                 "serialization",
                 "serialize"
             ],
-            "time": "2019-11-29T22:36:02+00:00"
+            "time": "2020-05-21T20:09:36+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -3836,16 +3846,16 @@
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v3.6.4",
+            "version": "v3.6.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "10d3f853fdf1f3a6b3c7ea0c4620d2f699713db5"
+                "reference": "8b64814b356b96a90d2bc942b152c80d8888b8d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/10d3f853fdf1f3a6b3c7ea0c4620d2f699713db5",
-                "reference": "10d3f853fdf1f3a6b3c7ea0c4620d2f699713db5",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8b64814b356b96a90d2bc942b152c80d8888b8d4",
+                "reference": "8b64814b356b96a90d2bc942b152c80d8888b8d4",
                 "shasum": ""
             },
             "require": {
@@ -3905,7 +3915,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-02T13:46:13+00:00"
+            "time": "2020-05-23T09:42:03+00:00"
         },
         {
             "name": "yajra/laravel-datatables-oracle",
diff --git a/public/solr.xslt b/public/solr.xslt
index aefeb41..be47eeb 100644
--- a/public/solr.xslt
+++ b/public/solr.xslt
@@ -53,7 +53,7 @@
                 <!-- id -->
                 <xsl:element name="field">
                     <xsl:attribute name="name">id</xsl:attribute>
-                    <xsl:value-of select="/Opus/Rdr_Dataset/@Id" />
+                    <xsl:value-of select="/Opus/Rdr_Dataset/@PublishId" />
                 </xsl:element>
 
                 <!-- year -->
diff --git a/resources/views/frontend/dataset/show.blade.php b/resources/views/frontend/dataset/show.blade.php
index ed66300..3715f6b 100644
--- a/resources/views/frontend/dataset/show.blade.php
+++ b/resources/views/frontend/dataset/show.blade.php
@@ -14,7 +14,7 @@
             </div>
             <h1 class="dataset__title">{{ $dataset->mainTitle()->value }}</h1>
 
-            <p class="dataset__id">{{ $dataset->id }}</p>
+            <p class="dataset__id">{{ $dataset->publish_id }}</p>
           </div>
           <div class="dataset">
 
diff --git a/solr.xslt b/solr.xslt
index 831ce21..5e6b65d 100644
--- a/solr.xslt
+++ b/solr.xslt
@@ -53,7 +53,7 @@
                 <!-- id -->
                 <xsl:element name="field">
                     <xsl:attribute name="name">id</xsl:attribute>
-                    <xsl:value-of select="/Opus/Rdr_Dataset/@Id" />
+                    <xsl:value-of select="/Opus/Rdr_Dataset/@PublishId" />
                 </xsl:element>
 
                 <!-- year -->