X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-authorities-home.pl;h=115012e231d8f54198d814ef0889c32d1680083a;hb=08382876306cfda839637c5f72a107b304458a8e;hp=9076bffe729e805846a8800cf5aa9d14708834d8;hpb=30fbc40061287caa48216a29a48af905d858f151;p=koha.git

diff --git a/opac/opac-authorities-home.pl b/opac/opac-authorities-home.pl
index 9076bffe72..115012e231 100755
--- a/opac/opac-authorities-home.pl
+++ b/opac/opac-authorities-home.pl
@@ -14,12 +14,13 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
-require Exporter;
+use warnings;
+
 use CGI;
 use C4::Auth;
 
@@ -30,8 +31,8 @@ use C4::AuthoritiesMarc;
 use C4::Koha;    # XXX subfield_is_koha_internal_p
 
 my $query        = new CGI;
-my $op           = $query->param('op');
-my $authtypecode = $query->param('authtypecode');
+my $op           = $query->param('op') || '';
+my $authtypecode = $query->param('authtypecode') || '';
 my $dbh          = C4::Context->dbh;
 
 my $startfrom = $query->param('startfrom');
@@ -40,35 +41,37 @@ $startfrom = 0 if ( !defined $startfrom );
 my ( $template, $loggedinuser, $cookie );
 my $resultsperpage;
 
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype ( sort { $authtypes->{$a}{'authtypetext'} cmp $authtypes->{$b}{'authtypetext'} }
-    keys %$authtypes )
-{
-    my $selected = 1 if $thisauthtype eq $authtypecode;
-    my %row = (
-        value        => $thisauthtype,
-        selected     => $selected,
-        authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
-    );
-    push @authtypesloop, \%row;
+my $authtypes     = getauthtypes();
+my @authtypesloop = ();
+foreach my $thisauthtype (
+    sort {
+        $authtypes->{$a}->{'authtypetext'}
+          cmp $authtypes->{$b}->{'authtypetext'}
+    }
+    keys %{$authtypes}
+  ) {
+    push @authtypesloop,
+      { value        => $thisauthtype,
+        selected     => $thisauthtype eq $authtypecode,
+        authtypetext => $authtypes->{$thisauthtype}->{'authtypetext'},
+      };
 }
 
 if ( $op eq "do_search" ) {
-	my @marclist = $query->param('marclist');
-	my @and_or = $query->param('and_or');
-	my @excluding = $query->param('excluding');
-	my @operator = $query->param('operator');
-	my $orderby = $query->param('orderby');
-	my @value = $query->param('value');
+    my @marclist = ($query->param('marclist'));
+    my @and_or = ($query->param('and_or'));
+    my @excluding = ($query->param('excluding'),);
+    my @operator = ($query->param('operator'));
+    my $orderby = $query->param('orderby');
+    my @value = ($query->param('value') || "",);
 
     $resultsperpage = $query->param('resultsperpage');
-    $resultsperpage = 19 if ( !defined $resultsperpage );
+    $resultsperpage = 20 if ( !defined $resultsperpage );
     my @tags;
     my ( $results, $total, @fields ) =
       SearchAuthorities( \@marclist, \@and_or, \@excluding, \@operator,
         \@value, $startfrom * $resultsperpage,
-        $resultsperpage, $authtypecode );
+        $resultsperpage, $authtypecode, $orderby );
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
             template_name   => "opac-authoritiessearchresultlist.tmpl",
@@ -82,21 +85,18 @@ if ( $op eq "do_search" ) {
     # multi page display gestion
     my $displaynext = 0;
     my $displayprev = $startfrom;
+    $total ||= 0;
     if ( ( $total - ( ( $startfrom + 1 ) * ($resultsperpage) ) ) > 0 ) {
         $displaynext = 1;
     }
 
-    my @field_data = ();
-
-# we must get parameters once again. Because if there is a mainentry, it has been replaced by something else during the search, thus the links next/previous would not work anymore
-    my @marclist_ini = $query->param('marclist');
-    for ( my $i = 0 ; $i <= $#marclist ; $i++ ) {
-        push @field_data, { term => "marclist",  val => $marclist_ini[$i] };
-        push @field_data, { term => "and_or",    val => $and_or[$i] };
-        push @field_data, { term => "excluding", val => $excluding[$i] };
-        push @field_data, { term => "operator",  val => $operator[$i] };
-        push @field_data, { term => "value",     val => $value[$i] };
-    }
+    my @field_data = (
+        { term => "marclist",  val => $marclist[0] },
+        { term => "and_or",    val => $and_or[0] },
+        { term => "excluding", val => $excluding[0] },
+        { term => "operator",  val => $operator[0] },
+        { term => "value",     val => $value[0] },
+    );
 
     my @numbers = ();
 
@@ -125,8 +125,13 @@ if ( $op eq "do_search" ) {
     else {
         $to = ( ( $startfrom + 1 ) * $resultsperpage );
     }
+    unless (C4::Context->preference('OPACShowUnusedAuthorities')) {
+        my @usedauths = grep { $_->{used} > 0 } @$results;
+        $results = \@usedauths;
+    }
     $template->param( result => $results ) if $results;
     $template->param( FIELDS => \@fields );
+    $template->param( orderby => $orderby );
     $template->param(
         startfrom      => $startfrom,
         displaynext    => $displaynext,
@@ -135,116 +140,17 @@ if ( $op eq "do_search" ) {
         startfromnext  => $startfrom + 1,
         startfromprev  => $startfrom - 1,
         searchdata     => \@field_data,
+        countfuzzy     => !(C4::Context->preference('OPACShowUnusedAuthorities')),
         total          => $total,
         from           => $from,
         to             => $to,
+        resultcount    => scalar @$results,
         numbers        => \@numbers,
         authtypecode   => $authtypecode,
+        authtypetext   => $authtypes->{$authtypecode}{'authtypetext'},
         isEDITORS      => $authtypecode eq 'EDITORS',
     );
 
-}
-elsif ( $op eq "delete" ) {
-
-    &DelAuthority( $authid, 1 );
-
-    ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-        {
-            template_name   => "authorities/authorities-home.tmpl",
-            query           => $query,
-            type            => 'intranet',
-            authnotrequired => 0,
-            flagsrequired   => { catalogue => 1 },
-            debug           => 1,
-        }
-    );
-
-    # 	$template->param("statements" => \@statements,
-    # 						"nbstatements" => $nbstatements);
-}
-elsif ( $op eq "AddStatement" ) {
-
-    ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-        {
-            template_name   => "authorities/authorities-home.tmpl",
-            query           => $query,
-            type            => 'intranet',
-            authnotrequired => 0,
-            flagsrequired   => { catalogue => 1 },
-            debug           => 1,
-        }
-    );
-
-    # Gets the entered information
-    my @marcfields = $query->param('marclist');
-    my @and_or     = $query->param('and_or');
-    my @excluding  = $query->param('excluding');
-    my @operator   = $query->param('operator');
-    my @value      = $query->param('value');
-
-    my @statements = ();
-
-    # List of the marc tags to display
-    my $marcarray = create_marclist();
-
-    my $nbstatements = $query->param('nbstatements');
-    $nbstatements = 1 if ( !defined $nbstatements );
-
-    for ( my $i = 0 ; $i < $nbstatements ; $i++ ) {
-        my %fields = ();
-
-        # Recreates the old scrolling lists with the previously selected values
-        my $marclist = create_scrolling_list(
-            {
-                name     => "marclist",
-                values   => $marcarray,
-                size     => 1,
-                default  => $marcfields[$i],
-                onChange => "sql_update()"
-            }
-        );
-
-        $fields{'marclist'} = $marclist;
-        $fields{'first'}    = 1 if ( $i == 0 );
-
-# Restores the and/or parameters (no need to test the 'and' for activation because it's the default value)
-        $fields{'or'} = 1 if ( $and_or[$i] eq "or" );
-
-        #Restores the "not" parameters
-        $fields{'not'} = 1 if ( $excluding[$i] );
-
-        #Restores the operators (most common operators first);
-        if    ( $operator[$i] eq "=" )        { $fields{'eq'}       = 1; }
-        elsif ( $operator[$i] eq "contains" ) { $fields{'contains'} = 1; }
-        elsif ( $operator[$i] eq "start" )    { $fields{'start'}    = 1; }
-        elsif ( $operator[$i] eq ">" )  { $fields{'gt'} = 1; } #greater than
-        elsif ( $operator[$i] eq ">=" ) { $fields{'ge'} = 1; } #greater or equal
-        elsif ( $operator[$i] eq "<" )  { $fields{'lt'} = 1; } #lower than
-        elsif ( $operator[$i] eq "<=" ) { $fields{'le'} = 1; } #lower or equal
-
-        #Restores the value
-        $fields{'value'} = $value[$i];
-
-        push @statements, \%fields;
-    }
-    $nbstatements++;
-
-    # The new scrolling list
-    my $marclist = create_scrolling_list(
-        {
-            name     => "marclist",
-            values   => $marcarray,
-            size     => 1,
-            onChange => "sql_update()"
-        }
-    );
-    push @statements, { "marclist" => $marclist };
-
-    $template->param(
-        "statements"   => \@statements,
-        "nbstatements" => $nbstatements
-    );
-
 }
 else {
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -252,7 +158,7 @@ else {
             template_name   => "opac-authorities-home.tmpl",
             query           => $query,
             type            => 'opac',
-            authnotrequired => 1,
+            authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
             debug           => 1,
         }
     );