moving to direct call syntax instead of indirection based, since it is unsafe

git-svn-id: svn://svn.open-ils.org/ILS/trunk@8705 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
index 872bd58..51a41e5 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
@@ -2903,7 +2903,7 @@ sub user_opt_in_at_org {
     my($self, $conn, $auth, $user_id) = @_;
 
     # see if we even need to enforce the opt-in value
-    return 1 unless $self->user_opt_in_enabled;
+    return 1 unless user_opt_in_enabled($self);
 
        my $e = new_editor(authtoken => $auth);
        return $e->event unless $e->checkauth;

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Collections.pm b/Open-ILS/src/perlmods/OpenILS/Application/Collections.pm
index 0b609c4..e558c0f 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Collections.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Collections.pm
@@ -120,8 +120,8 @@ sub users_of_interest {
     # let the client know we're still here
     $conn->status( new OpenSRF::DomainObject::oilsContinueStatus );
 
-    return $self->process_users_of_interest_results(
-        $conn, $e, $req, $start, $age, $fine_level, $location);
+    return process_users_of_interest_results(
+        $self, $conn, $e, $req, $start, $age, $fine_level, $location);
 }
 
 
@@ -234,8 +234,8 @@ sub users_owing_money {
     # let the client know we're still here
     $conn->status( new OpenSRF::DomainObject::oilsContinueStatus );
 
-    return $self->process_users_of_interest_results(
-        $conn, $e, $req, $start, $start_date, $end_date, $fine_level, @locations);
+    return process_users_of_interest_results(
+        $self, $conn, $e, $req, $start, $start_date, $end_date, $fine_level, @locations);
 }
 
 

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm b/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
index 569e540..4d411b3 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
@@ -270,7 +270,7 @@ sub fleshed_by_barcode {
        my $copyid = $e->search_asset_copy(
                {barcode => $barcode, deleted => 'f'}, {idlist=>1})->[0]
                or return $e->event;
-       return $self->fleshed_copy_retrieve2($conn, $copyid);
+       return fleshed_copy_retrieve2( $self, $conn, $copyid);
 }
 
 
@@ -559,7 +559,7 @@ sub cat_search_z_style_wrapper {
        $$searchhash{searches}{keyword}{term} .= join ' ', $$searchhash{searches}{keyword}{term}, $$args{search}{pubdate} if $$args{search}{pubdate};
        $$searchhash{searches}{keyword}{term} .= join ' ', $$searchhash{searches}{keyword}{term}, $$args{search}{item_type} if $$args{search}{item_type};
 
-       my $list = $self->the_quest_for_knowledge( $client, $searchhash );
+       my $list = the_quest_for_knowledge( $self, $client, $searchhash );
 
        if ($list->{count} > 0) {
                $result->{count} = $list->{count};
@@ -801,8 +801,8 @@ sub biblio_mrid_to_modsbatch {
        my ($mr, $evt) = _grab_metarecord($mrid);
        return $evt unless $mr;
 
-       my $mvr = $self->biblio_mrid_check_mvr($client, $mr);
-       $mvr = $self->biblio_mrid_make_modsbatch( $client, $mr ) unless $mvr;
+       my $mvr = biblio_mrid_check_mvr($self, $client, $mr);
+       $mvr = biblio_mrid_make_modsbatch( $self, $client, $mr ) unless $mvr;
 
        return $mvr unless ref($args);  
 

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm b/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
index c49bd45..c86a65f 100755 (executable)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
@@ -130,7 +130,7 @@ sub do_class_search {
 
                $tmp_args{query} = compile_query('and', $tmp_args{service}, $tmp_args{search});
 
-               my $res = $self->do_service_search( $conn, $auth, \%tmp_args );
+               my $res = do_service_search( $self, $conn, $auth, \%tmp_args );
 
                push @results, $res->{result};
                push @connections, $res->{connection};
@@ -171,7 +171,7 @@ sub do_service_search {
        $$args{port}    = $$info{port},
        $$args{db}              = $$info{db},
 
-       return $self->do_search( $conn, $auth, $args );
+       return do_search( $self, $conn, $auth, $args );
 }