Lowering truncation threshold for display of system preference values to better accom...
[koha.git] / admin / authorised_values.pl
index cb5a626..0a672a6 100755 (executable)
@@ -21,39 +21,29 @@ use strict;
 use CGI;
 use C4::Auth;
 use C4::Context;
+use C4::Koha;
 use C4::Output;
 
-use C4::Context;
-
 
 sub AuthorizedValuesForCategory  {
-       my ($searchstring,$type)=@_;
-       my $dbh = C4::Context->dbh;
-       $searchstring=~ s/\'/\\\'/g;
-       my @data=split(' ',$searchstring);
-       my $count=@data;
-       my $sth=$dbh->prepare("Select id,category,authorised_value,lib from authorised_values where (category = ?) order by category,authorised_value");
-       $sth->execute("$data[0]");
-       my @results;
-       my $cnt=0;
-       while (my $data=$sth->fetchrow_hashref){
+    my ($searchstring,$type)=@_;
+    my $dbh = C4::Context->dbh;
+    $searchstring=~ s/\'/\\\'/g;
+    my @data=split(' ',$searchstring);
+    my $count=@data;
+    my $sth=$dbh->prepare( 'Select id, category, authorised_value, lib, imageurl
+                              from authorised_values
+                              where (category = ?)
+                              order by category,authorised_value' );
+    $sth->execute("$data[0]");
+    my @results;
+    my $cnt=0;
+    while (my $data=$sth->fetchrow_hashref){
        push(@results,$data);
        $cnt ++;
-       }
-       $sth->finish;
-       return ($cnt,\@results);
-}
-
-sub _already_exists {
-    my ($category, $authorised_value) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare_cached("SELECT COUNT(*) FROM authorised_values
-                                    WHERE category = ?
-                                    AND authorised_value = ?");
-    $sth->execute($category, $authorised_value);
-    my ($count) = $sth->fetchrow_array();
-    $sth->finish();
-    return $count;
+    }
+    $sth->finish;
+    return ($cnt,\@results);
 }
 
 my $input = new CGI;
@@ -88,7 +78,7 @@ if ($op eq 'add_form') {
        my $data;
        if ($id) {
                my $dbh = C4::Context->dbh;
-               my $sth=$dbh->prepare("select id,category,authorised_value,lib from authorised_values where id=?");
+               my $sth=$dbh->prepare("select id, category, authorised_value, lib, imageurl from authorised_values where id=?");
                $sth->execute($id);
                $data=$sth->fetchrow_hashref;
                $sth->finish;
@@ -106,41 +96,73 @@ if ($op eq 'add_form') {
                $template->param('heading-add-authorized-value-p' => 1);
        }
        $template->param('use-heading-flags-p' => 1);
-       $template->param(category => $data->{'category'},
-                                                       authorised_value => $data->{'authorised_value'},
-                                                       lib => $data->{'lib'},
-                                                       id => $data->{'id'}
-                                                       );
+       $template->param( category        => $data->{'category'},
+                         authorised_value => $data->{'authorised_value'},
+                         lib              => $data->{'lib'},
+                         id               => $data->{'id'},
+                         imagesets        => C4::Koha::getImageSets( checked => $data->{'imageurl'} )
+                     );
+                          
 ################## ADD_VALIDATE ##################################
 # called by add_form, used to insert/modify data in DB
 } elsif ($op eq 'add_validate') {
        my $dbh = C4::Context->dbh;
+    my $new_category = $input->param('category');
+    my $new_authorised_value = $input->param('authorised_value');
+    my $imageurl=$input->param( 'imageurl' )|'';   
+    my $duplicate_entry = 0;
 
-    if (_already_exists($input->param('category'), $input->param('authorised_value'))) {
-     if ($id){
-      my $sth=$dbh->prepare("UPDATE authorised_values SET category=?,authorised_value=?,lib=? where id=?");
-      my $lib = $input->param('lib');
-      undef $lib if ($lib eq ""); # to insert NULL instead of a blank string
-  
-      $sth->execute($input->param('category'), $input->param('authorised_value'), $lib,$input->param('id'));          
-      print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$input->param('category')."\"></html>";
-      exit;
-     } else {       
-        $template->param(duplicate_category => $input->param('category'),
-                         duplicate_value =>  $input->param('authorised_value'),
+    if ( $id ) { # Update
+        my $sth = $dbh->prepare( "SELECT category, authorised_value FROM authorised_values WHERE id='$id' ");
+        $sth->execute();
+        my ($category, $authorised_value) = $sth->fetchrow_array();
+        $sth->finish;
+        if ( $authorised_value ne $new_authorised_value ) {
+            my $sth = $dbh->prepare_cached( "SELECT COUNT(*) FROM authorised_values " .
+                "WHERE category = '$new_category' AND authorised_value = '$new_authorised_value' and id<>$id");
+            $sth->execute();
+            ($duplicate_entry) = $sth->fetchrow_array();
+            warn "**** duplicate_entry = $duplicate_entry";
+        }
+        unless ( $duplicate_entry ) {
+            my $sth=$dbh->prepare( 'UPDATE authorised_values
+                                      SET category         = ?,
+                                          authorised_value = ?,
+                                          lib              = ?,
+                                          imageurl         = ?
+                                      WHERE id=?' );
+            my $lib = $input->param('lib');
+            undef $lib if ($lib eq ""); # to insert NULL instead of a blank string
+            $sth->execute($new_category, $new_authorised_value, $lib, $imageurl, $id);          
+            print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$new_category."\"></html>";
+            exit;
+        }
+    }
+    else { # Insert
+        my $sth = $dbh->prepare_cached( "SELECT COUNT(*) FROM authorised_values " .
+            "WHERE category = '$new_category' AND authorised_value = '$new_authorised_value' ");
+        $sth->execute();
+        ($duplicate_entry) = $sth->fetchrow_array();
+        $sth->finish();
+        unless ( $duplicate_entry ) {
+            my $sth=$dbh->prepare( 'INSERT INTO authorised_values
+                                    ( id, category, authorised_value, lib, imageurl )
+                                    values (?, ?, ?, ?, ?)' );
+           my $lib = $input->param('lib');
+           undef $lib if ($lib eq ""); # to insert NULL instead of a blank string
+           $sth->execute($id, $new_category, $new_authorised_value, $lib, $imageurl );
+           $sth->finish;
+           print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$input->param('category')."\"></html>";
+           exit;
+        }
+    }
+    if ( $duplicate_entry ) {       
+        $template->param(duplicate_category => $new_category,
+                         duplicate_value =>  $new_authorised_value,
                          else => 1);
         default_form();
      }           
-    } else {
-           my $sth=$dbh->prepare("INSERT INTO authorised_values (id,category,authorised_value,lib) values (?,?,?,?)");
-           my $lib = $input->param('lib');
-           undef $lib if ($lib eq ""); # to insert NULL instead of a blank string
        
-           $sth->execute($input->param('id'), $input->param('category'), $input->param('authorised_value'), $lib);
-           $sth->finish;
-           print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$input->param('category')."\"></html>";
-           exit;
-    }
 ################## DELETE_CONFIRM ##################################
 # called by default form, used to confirm deletion of data in DB
 } elsif ($op eq 'delete_confirm') {
@@ -221,17 +243,18 @@ sub default_form {
                        $toggle=0;
                }
                my %row_data;  # get a fresh hash for the row data
-               $row_data{category} = $results->[$i]{'category'};
+               $row_data{category}         = $results->[$i]{'category'};
                $row_data{authorised_value} = $results->[$i]{'authorised_value'};
-               $row_data{lib} = $results->[$i]{'lib'};
-               $row_data{edit} = "$script_name?op=add_form&amp;id=".$results->[$i]{'id'};
-               $row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=$searchfield&amp;id=".$results->[$i]{'id'};
+               $row_data{lib}              = $results->[$i]{'lib'};
+               $row_data{imageurl}         =  getitemtypeimagesrc('intranet') . '/' . $results->[$i]{'imageurl'};
+               $row_data{edit}             = "$script_name?op=add_form&amp;id=".$results->[$i]{'id'};
+               $row_data{delete}           = "$script_name?op=delete_confirm&amp;searchfield=$searchfield&amp;id=".$results->[$i]{'id'};
                push(@loop_data, \%row_data);
        }
 
-       $template->param(loop => \@loop_data,
-                                                       tab_list => $tab_list,
-                                                       category => $searchfield);
+       $template->param( loop     => \@loop_data,
+                          tab_list => $tab_list,
+                          category => $searchfield );
 
        if ($offset>0) {
                my $prevpage = $offset-$pagesize;