use Memoize because Memcache::Memoize is slow for me

[koha.git] / C4 / Suggestions.pm

diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm
index 5ea6c77..1a93f2e 100644 (file)
--- a/C4/Suggestions.pm
+++ b/C4/Suggestions.pm
@@ -1,6 +1,7 @@
 package C4::Suggestions;
 
 # Copyright 2000-2002 Katipo Communications
+# Parts Copyright Biblibre 2011
 #
 # This file is part of Koha.
 #
@@ -24,51 +25,27 @@ use CGI;
 
 use C4::Context;
 use C4::Output;
-use C4::Dates qw(format_date);
+use C4::Dates qw(format_date format_date_in_iso);
 use C4::SQLHelper qw(:all);
 use C4::Debug;
 use C4::Letters;
 use List::MoreUtils qw<any>;
-use base 'Exporter';  # parent would be better there
+use C4::Dates qw(format_date_in_iso);
+use base qw(Exporter);
 our $VERSION = 3.01;
 our @EXPORT  = qw<
-    &ConnectSuggestionAndBiblio
-    &CountSuggestion
-    &DelSuggestion
-    &GetSuggestion
-    &GetSuggestionByStatus
-    &GetSuggestionFromBiblionumber
-    &ModStatus
-    &ModSuggestion
-    &NewSuggestion
-    &SearchSuggestion
+    ConnectSuggestionAndBiblio
+    CountSuggestion
+    DelSuggestion
+    GetSuggestion
+    GetSuggestionByStatus
+    GetSuggestionFromBiblionumber
+    ModStatus
+    ModSuggestion
+    NewSuggestion
+    SearchSuggestion
+    DelSuggestionsOlderThan
 >;
-use C4::Dates qw(format_date_in_iso);
-use vars qw($VERSION @ISA @EXPORT);
-
-BEGIN {
-    # set the version for version checking
-    $VERSION = 3.01;
-    require Exporter;
-    @ISA = qw(Exporter);
-    @EXPORT = qw(
-        &NewSuggestion
-        &SearchSuggestion
-        &GetSuggestion
-        &GetSuggestionByStatus
-        &DelSuggestion
-        &CountSuggestion
-        &ModSuggestion
-        &ConnectSuggestionAndBiblio
-        &GetSuggestionFromBiblionumber
-        &ConnectSuggestionAndBiblio
-        &DelSuggestion
-        &GetSuggestion
-        &GetSuggestionByStatus
-        &GetSuggestionFromBiblionumber
-        &ModStatus
-    );
-}
 
 =head1 NAME
 
@@ -150,7 +127,7 @@ sub SearchSuggestion  {
             if ($userenv) {
                 if (($userenv->{flags} % 2) != 1 && !$suggestion->{branchcode}){
                 push @sql_params,$$userenv{branch};
-                push @query,q{ and (branchcode = ? or branchcode ='')};
+                push @query,q{ and (suggestions.branchcode = ? or suggestions.branchcode ='')};
                 }
             }
     }
@@ -170,6 +147,17 @@ sub SearchSuggestion  {
         }
     }
 
+    my $today = C4::Dates->today('iso');
+
+    foreach ( qw( suggesteddate manageddate accepteddate ) ) {
+        my $from = $_ . "_from";
+        my $to = $_ . "_to";
+        if ($$suggestion{$from} || $$suggestion{$to}) {
+            push @query, " AND suggestions.suggesteddate BETWEEN '" 
+                . (format_date_in_iso($$suggestion{$from}) || 0000-00-00) . "' AND '" . (format_date_in_iso($$suggestion{$to}) || $today) . "'";
+        } 
+    }
+
     $debug && warn "@query";
     my $sth=$dbh->prepare("@query");
     $sth->execute(@sql_params);
@@ -453,6 +441,23 @@ sub DelSuggestion {
     }
 }
 
+=head2 DelSuggestionsOlderThan
+    &DelSuggestionsOlderThan($days)
+    
+    Delete all suggestions older than TODAY-$days , that have be accepted or rejected.
+    
+=cut
+sub DelSuggestionsOlderThan {
+    my ($days) = @_;
+    return if not $days;
+    my $dbh = C4::Context->dbh;
+    
+    my $sth = $dbh->prepare("
+        DELETE FROM suggestions WHERE STATUS <> 'ASKED' AND date < ADDDATE(NOW(), ?);
+    ");
+    $sth->execute("-$days");
+}
+
 1;
 __END__