kohabug 2507 Fixing labels search to indicate keyword rather than title search

[koha.git] / reports / dictionary.pl

diff --git a/reports/dictionary.pl b/reports/dictionary.pl
index 30fcecd..7edd1d4 100755 (executable)
--- a/reports/dictionary.pl
+++ b/reports/dictionary.pl
@@ -22,6 +22,7 @@ use C4::Auth;
 use CGI;
 use C4::Output;
 use C4::Reports;
+use C4::Dates qw( DHTMLcalendar );
 
 =head1 NAME
 
@@ -127,13 +128,15 @@ elsif ($phase eq 'New Term step 4'){
                'definition_description' => $definition_description,
                'columns' => \@column_loop,
                'columnstring' => $columnstring,
-
+                'DHTMLcalendar_dateformat' => C4::Dates->DHTMLcalendar(),
        );
 }
 
 elsif ($phase eq 'New Term step 5'){
        # Confirmation screen
+       my $areas = C4::Reports::get_report_areas();
        my $area = $input->param('area');
+    my $areaname = $areas->[$area - 1]->{'name'};
        my $columnstring = $input->param('columnstring');
        my $definition_name=$input->param('definition_name');
        my $definition_description=$input->param('definition_description');     
@@ -143,32 +146,44 @@ elsif ($phase eq 'New Term step 5'){
        foreach my $crit (@criteria) {
                my $value = $input->param( $crit . "_value" );
                if ($value) {
-                       $query_criteria .= " AND $crit='$value'";
-                       my %tmp_hash;
-                       $tmp_hash{'name'}=$crit;
-                       $tmp_hash{'value'} = $value;
-                       push @criteria_loop,\%tmp_hash;
+                    my %tmp_hash;
+                    $tmp_hash{'name'}=$crit;
+                    $tmp_hash{'value'} = $value;
+                    push @criteria_loop,\%tmp_hash;
+                    if ($value =~ C4::Dates->regexp(C4::Context->preference('dateformat'))) {    
+                        my $date = C4::Dates->new($value);
+                        $value = $date->output("iso");
+                    }
+                    $query_criteria .= " AND $crit='$value'";
                }
-               
                $value = $input->param( $crit . "_start_value" );
                if ($value) {
-                       $query_criteria .= " AND $crit > '$value'";
-                       my %tmp_hash;
-                       $tmp_hash{'name'}="$crit Start";
-                       $tmp_hash{'value'} = $value;
-                       push @criteria_loop,\%tmp_hash;
+                    my %tmp_hash;
+                    $tmp_hash{'name'}="$crit Start";
+                    $tmp_hash{'value'} = $value;
+                    push @criteria_loop,\%tmp_hash;
+                    if ($value =~ C4::Dates->regexp(C4::Context->preference('dateformat'))) {    
+                        my $date = C4::Dates->new($value);
+                        $value = $date->output("iso");
+                    }
+                    $query_criteria .= " AND $crit >= '$value'";
                }
                $value = $input->param( $crit . "_end_value" );
                if ($value) {
-                       $query_criteria .= " AND $crit <= '$value'";
-                       my %tmp_hash;
-                       $tmp_hash{'name'}="$crit End";
-                       $tmp_hash{'value'} = $value;
-                       push @criteria_loop,\%tmp_hash;
+                    my %tmp_hash;
+                    $tmp_hash{'name'}="$crit End";
+                    $tmp_hash{'value'} = $value;
+                    push @criteria_loop,\%tmp_hash;
+                    if ($value =~ C4::Dates->regexp(C4::Context->preference('dateformat'))) {    
+                        my $date = C4::Dates->new($value);
+                        $value = $date->output("iso");
+                    }
+                    $query_criteria .= " AND $crit <= '$value'";
                }                 
        }
        $template->param( 'step_5' => 1,
                'area' => $area,
+               'areaname' => $areaname,
                'definition_name' => $definition_name,
                'definition_description' => $definition_description,
                'query' => $query_criteria,
@@ -192,7 +207,7 @@ elsif ($phase eq 'Delete Definition'){
        $no_html=1;
        my $id = $input->param('id');
        delete_definition($id);
-       print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=View%20Dictionary");
+       print $input->redirect("/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary");
        }
 
 $template->param( 'referer' => $referer );