From 51e2eeb32723b9d897ef254cb025cb2db9e50d24 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxOLI.org>
Date: Fri, 24 Sep 2021 12:45:10 -0400
Subject: [PATCH] LP#1729620: (follow-up) move OpenILS::WWW::OAI

Move the module to Open::WWW::SuperCat::OAI, matching other
record export and feed modules.

Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
---
 Open-ILS/examples/apache_24/eg_vhost.conf.in                | 2 +-
 Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm           | 4 ++++
 Open-ILS/src/perlmods/lib/OpenILS/WWW/{ => SuperCat}/OAI.pm | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)
 rename Open-ILS/src/perlmods/lib/OpenILS/WWW/{ => SuperCat}/OAI.pm (98%)

diff --git a/Open-ILS/examples/apache_24/eg_vhost.conf.in b/Open-ILS/examples/apache_24/eg_vhost.conf.in
index d62ca3bd98..aed61b6f21 100644
--- a/Open-ILS/examples/apache_24/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache_24/eg_vhost.conf.in
@@ -91,7 +91,7 @@ OSRFTranslatorConfig @sysconfdir@/opensrf_core.xml
 # Uncomment this section to enable the OAI2 provider service.
 #<Location /opac/extras/oai>
 #    SetHandler perl-script
-#    PerlHandler OpenILS::WWW::OAI
+#    PerlHandler OpenILS::WWW::SuperCat::OAI
 #    Options +ExecCGI
 #    PerlSendHeader On
 #    Require all granted
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm
index 2728f36460..a52280375d 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm
@@ -24,6 +24,7 @@ use Encode;
 use Unicode::Normalize;
 use OpenILS::Utils::Fieldmapper;
 use OpenILS::WWW::SuperCat::Feed;
+use OpenILS::WWW::SuperCat::OAI;
 use OpenSRF::Utils::Logger qw/$logger/;
 use OpenILS::Application::AppUtils;
 use OpenILS::Utils::TagURI;
@@ -279,6 +280,9 @@ sub child_init {
             }
         }
     }
+
+    OpenILS::WWW::SuperCat::OAI::child_init();
+
     return Apache2::Const::OK;
 }
 
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/OAI.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat/OAI.pm
similarity index 98%
rename from Open-ILS/src/perlmods/lib/OpenILS/WWW/OAI.pm
rename to Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat/OAI.pm
index 13961b3d33..e7beb33867 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/OAI.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat/OAI.pm
@@ -1,4 +1,4 @@
-# OpenILS::WWW::OAI manages OAI2 requests and responses.
+# OpenILS::WWW::SuperCat::OAI manages OAI2 requests and responses.
 #
 # Copyright (c) 2014-2017  International Institute of Social History
 #
@@ -19,7 +19,7 @@
 # Author: Lucien van Wouw <lwo@iisg.nl>
 
 
-package OpenILS::WWW::OAI;
+package OpenILS::WWW::SuperCat::OAI;
 use strict; use warnings;
 use Apache2::Const -compile => qw(OK REDIRECT DECLINED NOT_FOUND :log);
 use CGI;
@@ -106,7 +106,7 @@ sub handler {
     return Apache2::Const::DECLINED if (-e $apache->filename);
 
     unless (defined $oai) {
-        $logger->error('Application session variables not defined. Add \'PerlChildInitHandler OpenILS::WWW::OAI::child_init\' to the Apache virtual host configuration file.');
+        $logger->error('Application session variables not defined. Add \'PerlChildInitHandler OpenILS::WWW::SuperCat::OAI::child_init\' to the Apache virtual host configuration file.');
         child_init();
     }
 
-- 
2.11.0