[open-ils-commits] r8705 - in trunk/Open-ILS/src/perlmods/OpenILS/Application: . Search

[svn at svn.open-ils.org]

Author: miker
Date: 2008-02-08 16:01:19 -0500 (Fri, 08 Feb 2008)
New Revision: 8705

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Collections.pm
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
Log:
moving to direct call syntax instead of indirection based, since it is unsafe

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm	2008-02-08 20:57:29 UTC (rev 8704)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm	2008-02-08 21:01:19 UTC (rev 8705)
@@ -2903,7 +2903,7 @@
     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;

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Collections.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Collections.pm	2008-02-08 20:57:29 UTC (rev 8704)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Collections.pm	2008-02-08 21:01:19 UTC (rev 8705)
@@ -120,8 +120,8 @@
     # 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 @@
     # 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);
 }
 
 

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm	2008-02-08 20:57:29 UTC (rev 8704)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm	2008-02-08 21:01:19 UTC (rev 8705)
@@ -270,7 +270,7 @@
 	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 @@
 	$$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 @@
 	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);	
 

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm	2008-02-08 20:57:29 UTC (rev 8704)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm	2008-02-08 21:01:19 UTC (rev 8705)
@@ -130,7 +130,7 @@
 
 		$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 @@
 	$$args{port}	= $$info{port},
 	$$args{db}		= $$info{db},
 
-	return $self->do_search( $conn, $auth, $args );
+	return do_search( $self, $conn, $auth, $args );
 }