Merge pull request #167 from esmero/alliomeria-patch-1

Update for MeSH Autocomplete
esmero · Nov 29, 2023 · 1ccf67b · 1ccf67b
2 parents e1f5b5b + dcbd1db
commit 1ccf67b
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/src/Controller/AuthAutocompleteController.php b/src/Controller/AuthAutocompleteController.php
@@ -916,8 +916,8 @@ protected function mesh($input, $vocab, $rdftype) {
       return $results;
     }
 
-    $input = rawurlencode($input);
-    $urlindex = "/mesh/lookup/{$vocab}?label=" . $input .'&limit=10&match=' . $rdftype;
+    $input_encoded = rawurlencode($input);
+    $urlindex = "/mesh/lookup/{$vocab}?label=" . $input_encoded .'&limit=10&match=' . $rdftype;
     $baseurl = 'https://id.nlm.nih.gov';
     $remoteUrl = $baseurl . $urlindex;
     $options['headers'] = ['Accept' => 'application/json'];
@@ -926,12 +926,20 @@ protected function mesh($input, $vocab, $rdftype) {
     $jsondata = json_decode($body, TRUE);
     $json_error = json_last_error();
     if ($json_error == JSON_ERROR_NONE) {
-      if (count($jsondata) > 1) {
+      if (count($jsondata) > 0) {
         foreach ($jsondata as $entry) {
-          $results[] = [
-            'value' => $entry['resource'],
-            'label' => $entry['label'],
-          ];
+          if (strtolower(trim($entry['label'] ?? '')) == strtolower($input)) {
+            array_unshift($results, [
+              'value' => $entry['resource'],
+              'label' => $entry['label'],
+            ]);
+          } 
+          else {
+            $results[] = [
+              'value' => $entry['resource'],
+              'label' => $entry['label'],
+            ];
+          }
         }
       }
       else {