From 61dbbf55cffd543fef7cf3ad6e26185779a4160f Mon Sep 17 00:00:00 2001
From: Jane Sandberg <sandbej@linnbenton.edu>
Date: Wed, 25 Aug 2021 14:29:53 -0700
Subject: [PATCH] LP#1729620 Follow-up bugfixes

* Perl no longer allows the `keys` function to take scalar expressions
* Typo in service name in opensrf_core example config file
* Added oai schema script to the manifest file so that it is run as part of installation
* Unnecessary sigil

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
---
 Open-ILS/examples/opensrf_core.xml.example                | 2 +-
 Open-ILS/src/perlmods/lib/OpenILS/WWW/OAI.pm              | 4 ++--
 Open-ILS/src/sql/Pg/sql_file_manifest                     | 1 +
 docs/RELEASE_NOTES_NEXT/OAI2/new_oai_opensrf_service.adoc | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/examples/opensrf_core.xml.example b/Open-ILS/examples/opensrf_core.xml.example
index 3c0d366ac6..1a09e9ee54 100644
--- a/Open-ILS/examples/opensrf_core.xml.example
+++ b/Open-ILS/examples/opensrf_core.xml.example
@@ -30,7 +30,7 @@ Example OpenSRF bootstrap configuration file for Evergreen
           <service>open-ils.courses</service>
           <service>open-ils.curbside</service>
           <service>open-ils.fielder</service>
-          <service>openils.oai</service>
+          <service>open-ils.oai</service>
           <service>open-ils.pcrud</service>
           <service>open-ils.permacrud</service>
           <service>open-ils.reporter</service>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/OAI.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/OAI.pm
index 448847e9bc..0ca150c266 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/OAI.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/OAI.pm
@@ -231,7 +231,7 @@ sub identify {
 sub listMetadataFormats {
 
     my $response = HTTP::OAI::ListMetadataFormats->new();
-    foreach my $metadataPrefix (keys $oai_metadataformats) {
+    foreach my $metadataPrefix (keys %$oai_metadataformats) {
         my $metadata_format = $oai_metadataformats->{$metadataPrefix} ;
         $response->metadataFormat( HTTP::OAI::MetadataFormat->new(
            metadataPrefix    => $metadataPrefix,
@@ -250,7 +250,7 @@ sub listSets {
 
     if ($oai_sets) {
         my $response = HTTP::OAI::ListSets->new( );
-        foreach my $key (keys $oai_sets) {
+        foreach my $key (keys %$oai_sets) {
             my $set = $oai_sets->{$key} ;
             if ( $set && $set->{setSpec} && $set->{record_class} eq $record_class ) {
                 $response->set(
diff --git a/Open-ILS/src/sql/Pg/sql_file_manifest b/Open-ILS/src/sql/Pg/sql_file_manifest
index e4f9152166..97c478c244 100644
--- a/Open-ILS/src/sql/Pg/sql_file_manifest
+++ b/Open-ILS/src/sql/Pg/sql_file_manifest
@@ -48,6 +48,7 @@ FTS_CONFIG_FILE
 400.schema.action_trigger.sql
 
 500.view.cross-schema.sql
+600.schema.oai.sql
 
 800.fkeys.sql
 
diff --git a/docs/RELEASE_NOTES_NEXT/OAI2/new_oai_opensrf_service.adoc b/docs/RELEASE_NOTES_NEXT/OAI2/new_oai_opensrf_service.adoc
index 495ba5fe5e..c03ddcb6c6 100644
--- a/docs/RELEASE_NOTES_NEXT/OAI2/new_oai_opensrf_service.adoc
+++ b/docs/RELEASE_NOTES_NEXT/OAI2/new_oai_opensrf_service.adoc
@@ -101,7 +101,7 @@ Add the service to the public router in your opensrf_core.xml
                 <name>router</name>
                 <domain>public.realm</domain>
                 <services>
-                    <service>openils.oai</service>
+                    <service>open-ils.oai</service>
                     ...
 ```
 
-- 
2.43.2