use Memoize to cache results of GetAuthorisedValues

[koha.git] / C4 / Koha.pm

diff --git a/C4/Koha.pm b/C4/Koha.pm
index 290ef40..05e3074 100644 (file)
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -22,6 +22,7 @@ use strict;
 use C4::Context;
 use C4::Output;
 use URI::Split qw(uri_split);
+use Memoize;
 
 use vars qw($VERSION @ISA @EXPORT $DEBUG);
 
@@ -52,7 +53,6 @@ BEGIN {
                &GetAuthorisedValueCategories
                &GetKohaAuthorisedValues
                &GetAuthValCode
-               &GetManagedTagSubfields
                &GetNormalizedUPC
                &GetNormalizedISBN
                &GetNormalizedEAN
@@ -63,6 +63,9 @@ BEGIN {
        $DEBUG = 0;
 }
 
+# expensive functions
+memoize('GetAuthorisedValues');
+
 =head1 NAME
 
     C4::Koha - Perl Module containing convenience functions for Koha scripts
@@ -1069,49 +1072,6 @@ sub GetKohaAuthorisedValues {
   }
 }
 
-=head2 GetManagedTagSubfields
-
-=over 4
-
-$res = GetManagedTagSubfields();
-
-=back
-
-Returns a reference to a big hash of hash, with the Marc structure fro the given frameworkcode
-
-NOTE: This function is used only by the (incomplete) bulk editing feature.  Since
-that feature currently does not deal with items and biblioitems changes 
-correctly, those tags are specifically excluded from the list prepared
-by this function.
-
-For future reference, if a bulk item editing feature is implemented at some point, it
-needs some design thought -- for example, circulation status fields should not 
-be changed willy-nilly.
-
-=cut
-
-sub GetManagedTagSubfields{
-  my $dbh=C4::Context->dbh;
-  my $rq=$dbh->prepare(qq|
-SELECT 
-  DISTINCT CONCAT( marc_subfield_structure.tagfield, tagsubfield ) AS tagsubfield, 
-  marc_subfield_structure.liblibrarian as subfielddesc, 
-  marc_tag_structure.liblibrarian as tagdesc
-FROM marc_subfield_structure
-  LEFT JOIN marc_tag_structure 
-    ON marc_tag_structure.tagfield = marc_subfield_structure.tagfield
-    AND marc_tag_structure.frameworkcode = marc_subfield_structure.frameworkcode
-WHERE marc_subfield_structure.tab>=0
-AND marc_tag_structure.tagfield NOT IN (SELECT tagfield FROM marc_subfield_structure WHERE kohafield like 'items.%')
-AND marc_tag_structure.tagfield NOT IN (SELECT tagfield FROM marc_subfield_structure WHERE kohafield = 'biblioitems.itemtype')
-AND marc_subfield_structure.kohafield <> 'biblio.biblionumber'
-AND marc_subfield_structure.kohafield <>  'biblioitems.biblioitemnumber'
-ORDER BY marc_subfield_structure.tagfield, tagsubfield|);
-  $rq->execute;
-  my $data=$rq->fetchall_arrayref({});
-  return $data;
-}
-
 =head2 display_marc_indicators
 
 =over 4
@@ -1249,10 +1209,12 @@ sub _normalize_match_point {
 
 sub _isbn_cleanup ($) {
     my $normalized_isbn = shift;
-    $normalized_isbn =~/([0-9]{1,})/;
+    $normalized_isbn =~ s/-//g;
+    $normalized_isbn =~/([0-9x]{1,})/i;
     $normalized_isbn = $1;
     if (
         $normalized_isbn =~ /\b(\d{13})\b/ or
+        $normalized_isbn =~ /\b(\d{12})\b/i or
         $normalized_isbn =~ /\b(\d{10})\b/ or
         $normalized_isbn =~ /\b(\d{9}X)\b/i
     ) {