use OpenILS::EX;
use OpenSRF::Utils::Logger qw(:level);
-use Template qw(:template);
+use Template;
use Template::Stash;
use Time::HiRes qw(time);
$implementation = "OpenILS::Application::Search::AddedContent" unless $implementation;
$logger->debug("Attempting to load Added Content handler: $implementation");
- eval "use $implementation";
+ $implementation->use;
if($@) {
$logger->error("Unable to load Added Content handler [$implementation]: $@");
return;
$log->debug("Attempting to load $driver ...", DEBUG);
- eval "use $driver;";
+ $driver->use;
if ($@) {
$log->debug( "Can't load $driver! : $@", ERROR );
$log->error( "Can't load $driver! : $@");
# Suck in the method publishing modules
@OpenILS::Application::Storage::CDBI::ISA = ( $driver );
- eval 'use OpenILS::Application::Storage::Publisher;';
+ OpenILS::Application::Storage::Publisher->use;
if ($@) {
$log->debug("FAILURE LOADING Publisher! $@", ERROR);
throw OpenILS::EX::PANIC ( "FAILURE LOADING Publisher! : $@" );
}
- #eval 'use OpenILS::Application::Storage::WORM;';
- eval 'use OpenILS::Application::WoRM;';
+
+ OpenILS::Application::WoRM->use;
if ($@) {
$log->debug("FAILURE LOADING WORM! $@", ERROR);
throw OpenILS::EX::PANIC ( "FAILURE LOADING WoRM! : $@" );
use OpenSRF::Utils::Logger qw(:level);
use OpenSRF::EX qw/:try/;
-our $VERSION = undef;
+our $VERSION = 1;
my $log = 'OpenSRF::Utils::Logger';
sub child_init {
return $insert_total;
}
-eval '
-use OpenILS::Application::Storage::Publisher::actor;
-use OpenILS::Application::Storage::Publisher::action;
-use OpenILS::Application::Storage::Publisher::asset;
-use OpenILS::Application::Storage::Publisher::biblio;
-use OpenILS::Application::Storage::Publisher::config;
-use OpenILS::Application::Storage::Publisher::metabib;
-use OpenILS::Application::Storage::Publisher::authority;
-use OpenILS::Application::Storage::Publisher::money;
-use OpenILS::Application::Storage::Publisher::permission;
-use OpenILS::Application::Storage::Publisher::container;
-';
+OpenILS::Application::Storage::Publisher::actor->use;
+if ($@) {
+ $log->debug("ARG! Couldn't load actor class Publisher: $@", ERROR);
+ throw OpenSRF::EX::ERROR ("ARG! Couldn't load actor class Publisher: $@");
+}
+
+OpenILS::Application::Storage::Publisher::action->use;
+if ($@) {
+ $log->debug("ARG! Couldn't load action class Publisher: $@", ERROR);
+ throw OpenSRF::EX::ERROR ("ARG! Couldn't load action class Publisher: $@");
+}
+
+OpenILS::Application::Storage::Publisher::asset->use;
+if ($@) {
+ $log->debug("ARG! Couldn't load asset class Publisher: $@", ERROR);
+ throw OpenSRF::EX::ERROR ("ARG! Couldn't load asset class Publisher: $@");
+}
+
+OpenILS::Application::Storage::Publisher::biblio->use;
+if ($@) {
+ $log->debug("ARG! Couldn't load biblio class Publisher: $@", ERROR);
+ throw OpenSRF::EX::ERROR ("ARG! Couldn't load biblio class Publisher: $@");
+}
+
+OpenILS::Application::Storage::Publisher::config->use;
+if ($@) {
+ $log->debug("ARG! Couldn't load config class Publisher: $@", ERROR);
+ throw OpenSRF::EX::ERROR ("ARG! Couldn't load config class Publisher: $@");
+}
+OpenILS::Application::Storage::Publisher::metabib->use;
if ($@) {
- $log->debug("ARG! Couldn't load (at least one) class Publisher: $@", ERROR);
- throw OpenSRF::EX::ERROR ("ARG! Couldn't load (at least one) class Publisher: $@");
+ $log->debug("ARG! Couldn't load metabib class Publisher: $@", ERROR);
+ throw OpenSRF::EX::ERROR ("ARG! Couldn't load metabib class Publisher: $@");
}
+OpenILS::Application::Storage::Publisher::authority->use;
+if ($@) {
+ $log->debug("ARG! Couldn't load authority class Publisher: $@", ERROR);
+ throw OpenSRF::EX::ERROR ("ARG! Couldn't load authority class Publisher: $@");
+}
+
+OpenILS::Application::Storage::Publisher::money->use;
+if ($@) {
+ $log->debug("ARG! Couldn't load money class Publisher: $@", ERROR);
+ throw OpenSRF::EX::ERROR ("ARG! Couldn't load money class Publisher: $@");
+}
+
+OpenILS::Application::Storage::Publisher::permission->use;
+if ($@) {
+ $log->debug("ARG! Couldn't load permission class Publisher: $@", ERROR);
+ throw OpenSRF::EX::ERROR ("ARG! Couldn't load permission class Publisher: $@");
+}
+
+OpenILS::Application::Storage::Publisher::container->use;
+if ($@) {
+ $log->debug("ARG! Couldn't load container class Publisher: $@", ERROR);
+ throw OpenSRF::EX::ERROR ("ARG! Couldn't load container class Publisher: $@");
+}
+
+
for my $fmclass ( (Fieldmapper->classes) ) {
package OpenILS::EX;
use strict; use warnings;
-use Template qw(:template);
+use Template;
use OpenSRF::Utils::SettingsClient;
use OpenILS::Utils::Fieldmapper;
package OpenILS::Perm;
use strict; use warnings;
-use Template qw(:template);
+use Template;
use OpenSRF::Utils::SettingsClient;
use OpenILS::Utils::Fieldmapper;
use OpenSRF::EX qw(:try);
use Apache::RequestUtil;
use CGI ();
-use Template qw(:template);
+use Template;
use OpenSRF::EX qw(:try);
use Apache2::Log;
use Apache2::Const -compile => qw(OK REDIRECT :log);
use APR::Const -compile => qw(:error SUCCESS);
-use Template qw(:template);
+use Template;
use Apache2::RequestRec ();
use Apache2::RequestIO ();
use CGI ();
use CGI;
use Data::Dumper;
-use Template qw(:template);
+use Template;
use OpenSRF::EX qw(:try);
use OpenSRF::System;
use Apache2::RequestUtil;
#use CGI ();
-use Template qw(:template);
+use Template;
use OpenSRF::EX qw(:try);
use OpenSRF::System;
package OpenSRF;
use strict;
use Error;
+require UNIVERSAL::require;
use vars qw/$VERSION $AUTOLOAD/;
$VERSION = do { my @r=(q$Revision$=~/\d+/g); sprintf "%d."."%02d"x$#r,@r };
if (defined $app) {
$_app = $app;
- eval "use $_app;";
+ $_app->use;
if( $@ ) {
$log->error( "Error loading application_implementation: $app -> $@", ERROR);
}
my $class = "OpenSRF::DOM::Element::$tag";
unless (exists $_loaded_classes{$class}) {
- eval "use $class;";
+ $class->use;
$_loaded_classes{$class} = 1;
}
if ($@) {
package OpenSRF::System;
use strict; use warnings;
+use OpenSRF;
use base 'OpenSRF';
use OpenSRF::Utils::Logger qw(:level);
use OpenSRF::Transport::Listener;
_log( " * Server type: $server_type", INTERNAL );
- eval "use $server_type";
+ $server_type->use;
if( $@ ) {
throw OpenSRF::EX::PANIC ("Cannot set $server_type: $@" );
my( $class, $envelope ) = @_;
if( $envelope ) {
$message_envelope = $envelope;
- eval "use $envelope;";
+ $envelope->use;
if( $@ ) {
$logger->error(
"Error loading message_envelope: $envelope -> $@", ERROR);
my( $class, $listener ) = @_;
OpenSRF::Utils::Logger->transport("Loading Listener $listener", INFO );
if( $listener ) {
- eval "use $listener;";
+ $listener->use;
if( $@ ) {
OpenSRF::Utils::Logger->error(
"Unable to set transport listener: $@", ERROR );
sub set_peer_client {
my( $class, $peer ) = @_;
if( $peer ) {
- eval "use $peer;";
+ $peer->use;
if( $@ ) {
throw OpenSRF::EX::PANIC ( "Unable to set peer client: $@" );
}