From dd4c211faffba6a109bb176df4b6f04d073daed5 Mon Sep 17 00:00:00 2001
From: kouralex <1723419+kouralex@users.noreply.github.com>
Date: Fri, 17 Jul 2020 01:02:57 +0300
Subject: [PATCH 1/9] fixes fore failing vocabulary/global search; fixes
 erroring ajax search queries; fixes waypoint system used in search; added
 checks for various easyrdf http client errors

(cherry picked from commit 9f762ff14cdd17b92dc944dab9a1c0176fdc6efb)
---
 controller/WebController.php   | 41 +++++++++++++++++++++++++++++-----
 model/DataObject.php           | 25 +++++++++++++++------
 model/Model.php                | 29 ++++++++++++++++++------
 resource/css/styles.css        | 15 +++++++++++++
 resource/js/docready.js        | 25 +++++++++++++++++----
 resource/js/scripts.js         |  3 ++-
 view/search-result.twig        | 10 ++++++++-
 view/vocab-search-listing.twig |  4 ++--
 8 files changed, 124 insertions(+), 28 deletions(-)

diff --git a/controller/WebController.php b/controller/WebController.php
index ce1974948..731d4fdea 100644
--- a/controller/WebController.php
+++ b/controller/WebController.php
@@ -329,23 +329,47 @@ public function invokeGlobalSearch($request)
         $vocabObjects = array();
         if ($vocids) {
             foreach($vocids as $vocid) {
-                $vocabObjects[] = $this->model->getVocabulary($vocid);
+                try {
+                    $vocabObjects[] = $this->model->getVocabulary($vocid);
+                } catch (Exception $e) {
+                    // skip vocabularies not found in configuration
+                    // please note that this may result in global search
+                    // NB: should not happen in normal UI interaction
+                }
             }
         }
         $parameters->setVocabularies($vocabObjects);
 
+        $nondefaultEndpointVocs = array();
+
+        if (sizeOf($vocabObjects) != 1) {
+            // global search, either from all (sizeOf($vocabObjects) == 0) or from selected ones
+            if (sizeOf($vocabObjects) == 0) {
+                $vocabObjects = $this->model->getVocabularies();
+            }
+            $defaultEndpoint = $this->model->getConfig()->getDefaultEndpoint();
+            foreach($vocabObjects as $voc) {
+                if ($voc->getEndpoint() !== $defaultEndpoint) {
+                    $nondefaultEndpointVocs[] = $voc;
+                }
+            }
+        }
+
+        $counts = null;
+        $searchResults = null;
+        $errored = false;
+
         try {
             $countAndResults = $this->model->searchConceptsAndInfo($parameters);
+            $counts = $countAndResults['count'];
+            $searchResults = $countAndResults['results'];
         } catch (Exception $e) {
-            header("HTTP/1.0 404 Not Found");
+            $errored = true;
+            header("HTTP/1.0 500 Internal Server Error");
             if ($this->model->getConfig()->getLogCaughtExceptions()) {
                 error_log('Caught exception: ' . $e->getMessage());
             }
-            $this->invokeGenericErrorPage($request, $e->getMessage());
-            return;
         }
-        $counts = $countAndResults['count'];
-        $searchResults = $countAndResults['results'];
         $vocabList = $this->model->getVocabularyList();
         $sortedVocabs = $this->model->getVocabularyList(false, true);
         $langList = $this->model->getLanguages($lang);
@@ -357,6 +381,8 @@ public function invokeGlobalSearch($request)
                 'search_results' => $searchResults,
                 'rest' => $parameters->getOffset()>0,
                 'global_search' => true,
+                'search_failed' => $errored,
+                'skipped_vocabs' => $nondefaultEndpointVocs,
                 'term' => $request->getQueryParamRaw('q'),
                 'lang_list' => $langList,
                 'vocabs' => str_replace(' ', '+', $vocabs),
@@ -375,6 +401,7 @@ public function invokeVocabularySearch($request)
         $template = $this->twig->loadTemplate('vocab-search-listing.twig');
         $this->setLanguageProperties($request->getLang());
         $vocab = $request->getVocab();
+        $searchResults = null;
         try {
             $vocabTypes = $this->model->getTypes($request->getVocabid(), $request->getLang());
         } catch (Exception $e) {
@@ -388,6 +415,7 @@ public function invokeVocabularySearch($request)
                     'languages' => $this->languages,
                     'vocab' => $vocab,
                     'request' => $request,
+                    'search_results' => $searchResults
                 ));
 
             return;
@@ -411,6 +439,7 @@ public function invokeVocabularySearch($request)
                     'languages' => $this->languages,
                     'vocab' => $vocab,
                     'term' => $request->getQueryParam('q'),
+                    'search_results' => $searchResults
                 ));
             return;
         }
diff --git a/model/DataObject.php b/model/DataObject.php
index a1359758d..2865cbcc4 100644
--- a/model/DataObject.php
+++ b/model/DataObject.php
@@ -46,10 +46,15 @@ public function __construct($model, $resource)
     protected function getExternalLabel($exvoc, $exuri, $lang)
     {
         if ($exvoc) {
-            $exsparql = $exvoc->getSparql();
-            $results = $exsparql->queryLabel($exuri, $lang);
-
-            return isset($results[$lang]) ? $results[$lang] : null;
+            try {
+                $exsparql = $exvoc->getSparql();
+                $results = $exsparql->queryLabel($exuri, $lang);
+                return isset($results[$lang]) ? $results[$lang] : null;
+            } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
+                if ($this->model->getConfig()->getLogCaughtExceptions()) {
+                    error_log('Caught exception: ' . $e->getMessage());
+                }
+            }
         }
         return null;
     }
@@ -63,9 +68,15 @@ protected function getExternalLabel($exvoc, $exuri, $lang)
     protected function getExternalNotation($exvoc, $exuri)
     {
         if ($exvoc) {
-            $exsparql = $exvoc->getSparql();
-            $results = $exsparql->queryNotation($exuri);
-            return isset($results) ? $results : null;
+            try {
+                $exsparql = $exvoc->getSparql();
+                $results = $exsparql->queryNotation($exuri);
+                return isset($results) ? $results : null;
+            } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
+                if ($this->model->getConfig()->getLogCaughtExceptions()) {
+                    error_log('Caught exception: ' . $e->getMessage());
+                }
+            }
         }
         return null;
     }
diff --git a/model/Model.php b/model/Model.php
index 9b6b6d819..a4ed6b323 100644
--- a/model/Model.php
+++ b/model/Model.php
@@ -470,11 +470,18 @@ private function disambiguateVocabulary($vocabs, $uri, $preferredVocabId = null)
         if($preferredVocabId != null) {
             foreach ($vocabs as $vocab) {
                 if($vocab->getId() == $preferredVocabId) {
-                    // double check that a label exists in the preferred vocabulary
-                    if ($vocab->getConceptLabel($uri, null) !== null) {
-                        return $vocab;
-                    } else {
-                        // not found in preferred vocabulary, fall back to next method
+                    try {
+                        // double check that a label exists in the preferred vocabulary
+                        if ($vocab->getConceptLabel($uri, null) !== null) {
+                            return $vocab;
+                        } else {
+                            // not found in preferred vocabulary, fall back to next method
+                            break;
+                        }
+                    } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
+                        if ($this->getConfig()->getLogCaughtExceptions()) {
+                            error_log('Caught exception: ' . $e->getMessage());
+                        }
                         break;
                     }
                 }
@@ -483,8 +490,16 @@ private function disambiguateVocabulary($vocabs, $uri, $preferredVocabId = null)
 
         // no preferred vocabulary, or it was not found, search in which vocabulary the concept has a label
         foreach ($vocabs as $vocab) {
-            if ($vocab->getConceptLabel($uri, null) !== null)
-                return $vocab;
+            try {
+                if ($vocab->getConceptLabel($uri, null) !== null) {
+                    return $vocab;
+                }
+            } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
+                if ($this->getConfig()->getLogCaughtExceptions()) {
+                    error_log('Caught exception: ' . $e->getMessage());
+                }
+                break;
+            }
         }
 
         // if the URI couldn't be found, fall back to the first vocabulary
diff --git a/resource/css/styles.css b/resource/css/styles.css
index aeaf2fc89..ffdcb4a2e 100644
--- a/resource/css/styles.css
+++ b/resource/css/styles.css
@@ -1068,6 +1068,21 @@ div#sidebar-grey > div > div > form.search-options {
   top: 10px;
 }
 
+.search-result-listing .alert .btn-default {
+  position: unset;
+  vertical-align: unset;
+  margin-left: 15px;
+  font-size: 18px;
+}
+
+.alert h4, .alert h3  {
+  display: inline;
+}
+
+.search-result-listing .alert-warning h4 {
+  display: block;
+}
+
 .search-options .mCSB_container > li > a > .radio {
   margin: 0;
   padding-left: 25px;
diff --git a/resource/js/docready.js b/resource/js/docready.js
index 03e3d75b4..6d82341f6 100644
--- a/resource/js/docready.js
+++ b/resource/js/docready.js
@@ -844,7 +844,7 @@ $(function() { // DOCUMENT READY
       $('.search-result-listing').append($ready);
     }
     else {
-      $trigger.waypoint(function() { waypointCallback(); }, options);
+      $trigger.waypoint(function() { waypointCallback(this); }, options);
     }
   }
 
@@ -894,9 +894,13 @@ $(function() { // DOCUMENT READY
     changeOffset += 200;
   }
 
-  function waypointCallback() {
+  function waypointCallback(waypoint) {
+    if ($('.search-result-listing > p .spinner,.search-result-listing .alert-danger').length > 0) {
+      return false;
+    }
     var number_of_hits = $(".search-result").length;
-    if (number_of_hits < parseInt($('.search-count p').text().substr(0, $('.search-count p').text().indexOf(' ')), 10)) { $('.search-result-listing').append($loading);
+    if (number_of_hits < parseInt($('.search-count p').text().substr(0, $('.search-count p').text().indexOf(' ')), 10)) {
+      $('.search-result-listing').append($loading);
       var typeLimit = $('#type-limit').val();
       var schemeLimit = $('#scheme-limit').val();
       var groupLimit = $('#group-limit').val();
@@ -917,7 +921,20 @@ $(function() { // DOCUMENT READY
             $('.search-result-listing').append($ready);
             return false;
           }
-          $('.search-result:nth-last-of-type(4)').waypoint(function() { waypointCallback(); }, options );
+          waypoint.destroy();
+          $('.search-result:nth-last-of-type(4)').waypoint(function() { waypointCallback(this); }, options );
+        },
+        error: function(jqXHR, textStatus, errorThrown) {
+          $loading.detach();
+          var $failedSearch = $('<div class="alert alert-danger"><h4>Error: Loading for more items failed!</h4></div>');
+          var $retryButton = $('<button class="btn btn-default" type="button">Retry</button>');
+          $retryButton.on('click', function () {
+            $failedSearch.remove();
+            waypointCallback(waypoint);
+            return false;
+          });
+          $failedSearch.append($retryButton)
+          $('.search-result-listing').append($failedSearch);
         }
       });
     }
diff --git a/resource/js/scripts.js b/resource/js/scripts.js
index 6ec85e381..f405a91ee 100644
--- a/resource/js/scripts.js
+++ b/resource/js/scripts.js
@@ -210,7 +210,8 @@ function loadLimitedResults(parameters) {
   clearResultsAndAddSpinner();
   $.ajax({
     data: parameters,
-    success : function(data) {
+    complete : function(jqXHR, textStatus) {
+      var data = jqXHR.responseText;
       var response = $('.search-result-listing', data).html();
       if (window.history.pushState) { window.history.pushState({url: this.url}, '', this.url); }
       $('.search-result-listing').append(response);
diff --git a/view/search-result.twig b/view/search-result.twig
index 676b36f35..a2530d9c1 100644
--- a/view/search-result.twig
+++ b/view/search-result.twig
@@ -2,7 +2,15 @@
 <div class="search-count{% if limit_type or limit_parent or limit_group or limit_scheme %} search-limited{% endif %}"><p>{% trans %}{{ search_count }} results for '{{ term }}'{% endtrans %}{% if limit_type %}, {% trans "limited to type" %} '{% for type in limit_type %}{{ type }}{% if loop.last == false %}, {% endif %}{% endfor %}'{% endif %}{% if limit_parent %}, {% trans "limited to parent" %} '{{ limit_parent }}'{% endif %}{% if limit_group %}, {% trans "limited to group" %} '{{ limit_group }}'{% endif %}{% if limit_scheme %}, {% trans "limited to scheme" %} '{% for scheme in limit_scheme %}{{ scheme }}{% if loop.last == false %}, {% endif %}{% endfor %}'{% endif %}</p>
 </div>{% if limit_type or limit_parent or limit_group or limit_scheme %}<button type="button" class="btn btn-default" id="remove-limits">{% trans "Clear limitations" %}</button>{% endif %}
 {% endif %}
-{% if search_results is defined and search_results|length == 0 %}<p class="no-results">{% trans 'The search provided no results.' %}</p>{% endif %}
+{% if global_search and not search_failed and skipped_vocabs|length > 0 %}
+<div class="alert alert-warning">
+{% for voc in skipped_vocabs %}
+{% set vocTitle = voc.title %}
+<h4>{% trans %}Warning: Skipped searching from '{{vocTitle}}' vocabulary!{% endtrans %}</h4>
+{% endfor %}
+</div>
+{% endif %}
+{% if search_results is not null and search_results|length == 0 %}<p class="no-results">{% trans 'The search provided no results.' %}</p>{% endif %}
 {% for concept in search_results %} {# loop through the hits #}
 <div class="search-result">
   {% spaceless %}
diff --git a/view/vocab-search-listing.twig b/view/vocab-search-listing.twig
index 95d9b2902..3be9b7cd2 100644
--- a/view/vocab-search-listing.twig
+++ b/view/vocab-search-listing.twig
@@ -6,9 +6,9 @@
 <div class="search-result-listing">
   <h2 class="sr-only">{% trans "Search results" %}</h2>
   {% include 'search-result.twig' %}
-  {% if search_results is not defined and not global_search %}
+  {% if search_results is null %}
   <div class="alert alert-danger">
-    {% if request.vocabid == 'null' %}
+    {% if request.vocabid == 'null' and not global_search %}
     <h4>{% trans %}Error: Requested vocabulary not found!{% endtrans %}</h4>
     {% else %}
     <h4>{% trans %}Error: Search failed!{% endtrans %}</h4>

From 99d8194c85642c5cead56f912c9582bd71163227 Mon Sep 17 00:00:00 2001
From: Osma Suominen <osma.suominen@helsinki.fi>
Date: Thu, 9 Sep 2021 11:44:58 +0300
Subject: [PATCH 2/9] catch ValueError instead of Exception, since
 getVocabulary throws it nowadays

---
 controller/WebController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controller/WebController.php b/controller/WebController.php
index 731d4fdea..0f13bc105 100644
--- a/controller/WebController.php
+++ b/controller/WebController.php
@@ -331,7 +331,7 @@ public function invokeGlobalSearch($request)
             foreach($vocids as $vocid) {
                 try {
                     $vocabObjects[] = $this->model->getVocabulary($vocid);
-                } catch (Exception $e) {
+                } catch (ValueError $e) {
                     // skip vocabularies not found in configuration
                     // please note that this may result in global search
                     // NB: should not happen in normal UI interaction

From 2d5f1ee3f6f7c7ca7151bca3bf8dd046cad83942 Mon Sep 17 00:00:00 2001
From: Osma Suominen <osma.suominen@helsinki.fi>
Date: Thu, 9 Sep 2021 11:49:25 +0300
Subject: [PATCH 3/9] fail fast with an error page instead of skipping unknown
 vocabularies

---
 controller/WebController.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/controller/WebController.php b/controller/WebController.php
index 0f13bc105..8a7b07861 100644
--- a/controller/WebController.php
+++ b/controller/WebController.php
@@ -332,9 +332,12 @@ public function invokeGlobalSearch($request)
                 try {
                     $vocabObjects[] = $this->model->getVocabulary($vocid);
                 } catch (ValueError $e) {
-                    // skip vocabularies not found in configuration
-                    // please note that this may result in global search
-                    // NB: should not happen in normal UI interaction
+                    // fail fast with an error page if the vocabulary cannot be found
+                    if ($this->model->getConfig()->getLogCaughtExceptions()) {
+                        error_log('Caught exception: ' . $e->getMessage());
+                    }
+                    header("HTTP/1.0 400 Bad Request");
+                    return $this->invokeGenericErrorPage($request, $e->getMessage());
                 }
             }
         }

From 21ee3c8666a46ae99573352012ef28705e54d675 Mon Sep 17 00:00:00 2001
From: Osma Suominen <osma.suominen@helsinki.fi>
Date: Thu, 9 Sep 2021 12:39:30 +0300
Subject: [PATCH 4/9] Minimal CSS styling for retry button on search result
 page

---
 resource/css/styles.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resource/css/styles.css b/resource/css/styles.css
index ffdcb4a2e..8dc85da13 100644
--- a/resource/css/styles.css
+++ b/resource/css/styles.css
@@ -522,6 +522,10 @@ ul.dropdown-menu > li:last-child > input {
   margin: 10px 0px;
 }
 
+.search-result-listing > .alert > .btn-default {
+  border-radius: 0;
+}
+
 .search-result-listing .search-count {
   text-align: left;
   margin-left: 15px;

From 22f57ff6cc2f652d94bf8a9a7092aa229bfbe277 Mon Sep 17 00:00:00 2001
From: Osma Suominen <osma.suominen@helsinki.fi>
Date: Thu, 9 Sep 2021 12:46:35 +0300
Subject: [PATCH 5/9] Add translations (fi/sv/en) for error message and button
 shown on search result page

---
 resource/js/docready.js                       |   4 ++--
 .../translations/en/LC_MESSAGES/skosmos.mo    | Bin 13734 -> 13846 bytes
 .../translations/fi/LC_MESSAGES/skosmos.mo    | Bin 14023 -> 14152 bytes
 resource/translations/skosmos_en.po           |   6 ++++++
 resource/translations/skosmos_fi.po           |   6 ++++++
 resource/translations/skosmos_sv.po           |   6 ++++++
 .../translations/sv/LC_MESSAGES/skosmos.mo    | Bin 13918 -> 14044 bytes
 view/scripts.twig                             |   2 ++
 8 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/resource/js/docready.js b/resource/js/docready.js
index 6d82341f6..3362aaa49 100644
--- a/resource/js/docready.js
+++ b/resource/js/docready.js
@@ -926,8 +926,8 @@ $(function() { // DOCUMENT READY
         },
         error: function(jqXHR, textStatus, errorThrown) {
           $loading.detach();
-          var $failedSearch = $('<div class="alert alert-danger"><h4>Error: Loading for more items failed!</h4></div>');
-          var $retryButton = $('<button class="btn btn-default" type="button">Retry</button>');
+          var $failedSearch = $('<div class="alert alert-danger"><h4>' + loading_failed_text + '</h4></div>');
+          var $retryButton = $('<button class="btn btn-default" type="button">' + loading_retry_text + '</button>');
           $retryButton.on('click', function () {
             $failedSearch.remove();
             waypointCallback(waypoint);
diff --git a/resource/translations/en/LC_MESSAGES/skosmos.mo b/resource/translations/en/LC_MESSAGES/skosmos.mo
index f727641b3f341ee656f4c551299edb9210b74a68..2b920a38fded63724c452f1a5907006b43aa7106 100644
GIT binary patch
delta 4557
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

delta 4447
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
Y(ss2C-FnPwS~IlcO$~qPbz{r_1Dvp)q5uE@

diff --git a/resource/translations/fi/LC_MESSAGES/skosmos.mo b/resource/translations/fi/LC_MESSAGES/skosmos.mo
index 3dd9577cc896a78d190636a821b1c7f530f6ccbb..f6f23cc7e794d3bb0abaaf603b37fe7e18fdc888 100644
GIT binary patch
delta 4530
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

delta 4439
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
NV=vbzJrF-9_<zc!orwSd

diff --git a/resource/translations/skosmos_en.po b/resource/translations/skosmos_en.po
index 48210f7ed..e87c0a0c4 100644
--- a/resource/translations/skosmos_en.po
+++ b/resource/translations/skosmos_en.po
@@ -860,3 +860,9 @@ msgstr "Error: Search failed!"
 
 msgid "Error: Failed to retrieve vocabulary information!"
 msgstr "Error: Failed to retrieve vocabulary information!"
+
+msgid "Error: Loading more items failed!"
+msgstr "Error: Loading more items failed!"
+
+msgid "Retry"
+msgstr "Retry"
diff --git a/resource/translations/skosmos_fi.po b/resource/translations/skosmos_fi.po
index 7c7c1b255..fc002a68a 100644
--- a/resource/translations/skosmos_fi.po
+++ b/resource/translations/skosmos_fi.po
@@ -859,3 +859,9 @@ msgstr "Virhe: Haku epäonnistui!"
 
 msgid "Error: Failed to retrieve vocabulary information!"
 msgstr "Virhe: Sanaston tietojen haku epäonnistui!"
+
+msgid "Error: Loading more items failed!"
+msgstr "Virhe: Lisätulosten haku epäonnistui!"
+
+msgid "Retry"
+msgstr "Yritä uudelleen"
diff --git a/resource/translations/skosmos_sv.po b/resource/translations/skosmos_sv.po
index 03dd2154d..8ce12a786 100644
--- a/resource/translations/skosmos_sv.po
+++ b/resource/translations/skosmos_sv.po
@@ -857,3 +857,9 @@ msgstr "Fel: Sökningen misslyckades!"
 
 msgid "Error: Failed to retrieve vocabulary information!"
 msgstr "Fel: Information om vokabulären kunde inte hämtas!"
+
+msgid "Error: Loading more items failed!"
+msgstr "Fel: Flera resultat kunde inte hämtas!"
+
+msgid "Retry"
+msgstr "Försök igen"
diff --git a/resource/translations/sv/LC_MESSAGES/skosmos.mo b/resource/translations/sv/LC_MESSAGES/skosmos.mo
index aa01b2eb28445915968ee5889810945b6cfc52d8..20ec49095baa4c27dc6e466015a0f8dbaf6b8a80 100644
GIT binary patch
delta 4531
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

delta 4439
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

diff --git a/view/scripts.twig b/view/scripts.twig
index 1a980a287..0f62b0efe 100644
--- a/view/scripts.twig
+++ b/view/scripts.twig
@@ -2,6 +2,8 @@
 <!-- translations needed in javascript -->
 var noResultsTranslation = "{% trans %}No results{% endtrans %}";
 var loading_text = "{% trans %}Loading more items{% endtrans %}";
+var loading_failed_text = "{% trans %}Error: Loading more items failed!{% endtrans %}";
+var loading_retry_text = "{% trans %}Retry{% endtrans %}";
 var jstree_loading = "{% trans %}Loading{% endtrans %} ...";
 var results_disp = "{% trans %}All %d results displayed{% endtrans %}";
 var all_vocabs  = "{% trans %}from all{% endtrans %}";

From 189fe980b63d5e4f22645aad00aefe94cfd65fb5 Mon Sep 17 00:00:00 2001
From: Osma Suominen <osma.suominen@helsinki.fi>
Date: Thu, 9 Sep 2021 12:50:08 +0300
Subject: [PATCH 6/9] Avoid using return value from method that doesn't return
 anything (bug found by sonarqube)

---
 controller/WebController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/controller/WebController.php b/controller/WebController.php
index 8a7b07861..ed0ea6f22 100644
--- a/controller/WebController.php
+++ b/controller/WebController.php
@@ -337,7 +337,8 @@ public function invokeGlobalSearch($request)
                         error_log('Caught exception: ' . $e->getMessage());
                     }
                     header("HTTP/1.0 400 Bad Request");
-                    return $this->invokeGenericErrorPage($request, $e->getMessage());
+                    $this->invokeGenericErrorPage($request, $e->getMessage());
+                    return;
                 }
             }
         }

From 14eac78e82cb3434df8d911d52386c28df26e597 Mon Sep 17 00:00:00 2001
From: Osma Suominen <osma.suominen@helsinki.fi>
Date: Thu, 9 Sep 2021 12:52:27 +0300
Subject: [PATCH 7/9] use empty() instead of sizeof(xxx) == 0 which is clearer
 (bug found by sonarqube)

---
 controller/WebController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controller/WebController.php b/controller/WebController.php
index ed0ea6f22..d3725a086 100644
--- a/controller/WebController.php
+++ b/controller/WebController.php
@@ -348,7 +348,7 @@ public function invokeGlobalSearch($request)
 
         if (sizeOf($vocabObjects) != 1) {
             // global search, either from all (sizeOf($vocabObjects) == 0) or from selected ones
-            if (sizeOf($vocabObjects) == 0) {
+            if (empty($vocabObjects)) {
                 $vocabObjects = $this->model->getVocabularies();
             }
             $defaultEndpoint = $this->model->getConfig()->getDefaultEndpoint();

From c7771867e050ce7b4ef3d125b84f3e068702a574 Mon Sep 17 00:00:00 2001
From: Osma Suominen <osma.suominen@helsinki.fi>
Date: Thu, 9 Sep 2021 15:28:51 +0300
Subject: [PATCH 8/9] Adjust for change to ValueError

---
 model/Model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/model/Model.php b/model/Model.php
index a4ed6b323..5cc570140 100644
--- a/model/Model.php
+++ b/model/Model.php
@@ -245,7 +245,7 @@ public function searchConcepts($params)
                 try {
                     $hitvoc = $this->getVocabularyByGraph($hit['graph']);
                     $hit['vocab'] = $hitvoc->getId();
-                } catch (Exception $e) {
+                } catch (ValueError $e) {
                     trigger_error($e->getMessage(), E_USER_WARNING);
                     $hitvoc = null;
                     $hit['vocab'] = "???";
@@ -255,7 +255,7 @@ public function searchConcepts($params)
 
             $hit['voc'] = $hitvoc;
 
-            if (!$hitvoc->containsURI($hit['uri'])) {
+            if ($hitvoc === null || !$hitvoc->containsURI($hit['uri'])) {
                 // if uri is a external vocab uri that is included in the current vocab
                 $realvoc = $this->guessVocabularyFromURI($hit['uri'], $voc !== null ? $voc->getId() : null);
                 if ($realvoc !== $hitvoc) {

From ee5e40f4b72b6d0d59f3ad145cddd12b5b256e8d Mon Sep 17 00:00:00 2001
From: Osma Suominen <osma.suominen@helsinki.fi>
Date: Thu, 9 Sep 2021 16:03:57 +0300
Subject: [PATCH 9/9] Remove warning message about skipped vocabs (too
 obtrusive and the user can't do anything about it)

---
 controller/WebController.php | 16 ----------------
 view/search-result.twig      |  8 --------
 2 files changed, 24 deletions(-)

diff --git a/controller/WebController.php b/controller/WebController.php
index d3725a086..f2034280d 100644
--- a/controller/WebController.php
+++ b/controller/WebController.php
@@ -344,21 +344,6 @@ public function invokeGlobalSearch($request)
         }
         $parameters->setVocabularies($vocabObjects);
 
-        $nondefaultEndpointVocs = array();
-
-        if (sizeOf($vocabObjects) != 1) {
-            // global search, either from all (sizeOf($vocabObjects) == 0) or from selected ones
-            if (empty($vocabObjects)) {
-                $vocabObjects = $this->model->getVocabularies();
-            }
-            $defaultEndpoint = $this->model->getConfig()->getDefaultEndpoint();
-            foreach($vocabObjects as $voc) {
-                if ($voc->getEndpoint() !== $defaultEndpoint) {
-                    $nondefaultEndpointVocs[] = $voc;
-                }
-            }
-        }
-
         $counts = null;
         $searchResults = null;
         $errored = false;
@@ -386,7 +371,6 @@ public function invokeGlobalSearch($request)
                 'rest' => $parameters->getOffset()>0,
                 'global_search' => true,
                 'search_failed' => $errored,
-                'skipped_vocabs' => $nondefaultEndpointVocs,
                 'term' => $request->getQueryParamRaw('q'),
                 'lang_list' => $langList,
                 'vocabs' => str_replace(' ', '+', $vocabs),
diff --git a/view/search-result.twig b/view/search-result.twig
index a2530d9c1..4e1d521b5 100644
--- a/view/search-result.twig
+++ b/view/search-result.twig
@@ -2,14 +2,6 @@
 <div class="search-count{% if limit_type or limit_parent or limit_group or limit_scheme %} search-limited{% endif %}"><p>{% trans %}{{ search_count }} results for '{{ term }}'{% endtrans %}{% if limit_type %}, {% trans "limited to type" %} '{% for type in limit_type %}{{ type }}{% if loop.last == false %}, {% endif %}{% endfor %}'{% endif %}{% if limit_parent %}, {% trans "limited to parent" %} '{{ limit_parent }}'{% endif %}{% if limit_group %}, {% trans "limited to group" %} '{{ limit_group }}'{% endif %}{% if limit_scheme %}, {% trans "limited to scheme" %} '{% for scheme in limit_scheme %}{{ scheme }}{% if loop.last == false %}, {% endif %}{% endfor %}'{% endif %}</p>
 </div>{% if limit_type or limit_parent or limit_group or limit_scheme %}<button type="button" class="btn btn-default" id="remove-limits">{% trans "Clear limitations" %}</button>{% endif %}
 {% endif %}
-{% if global_search and not search_failed and skipped_vocabs|length > 0 %}
-<div class="alert alert-warning">
-{% for voc in skipped_vocabs %}
-{% set vocTitle = voc.title %}
-<h4>{% trans %}Warning: Skipped searching from '{{vocTitle}}' vocabulary!{% endtrans %}</h4>
-{% endfor %}
-</div>
-{% endif %}
 {% if search_results is not null and search_results|length == 0 %}<p class="no-results">{% trans 'The search provided no results.' %}</p>{% endif %}
 {% for concept in search_results %} {# loop through the hits #}
 <div class="search-result">