# Suite 330, Boston, MA 02111-1307 USA
use strict;
-require Exporter;
+use warnings;
+
use CGI;
use C4::Auth;
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');
}
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 @marclist = ($query->param('marclista'),$query->param('marclistb'),$query->param('marclistc'));
+ my @and_or = ($query->param('and_ora'),$query->param('and_orb'),$query->param('and_orc'));
+ my @excluding = ($query->param('excludinga'),$query->param('excludingb'),$query->param('excludingc'),);
+ my @operator = ($query->param('operatora'),$query->param('operatorb'),$query->param('operatorc'));
my $orderby = $query->param('orderby');
- my @value = $query->param('value');
+ my @value = ($query->param('valuea') || "",$query->param('valueb') || "",$query->param('valuec') || "",);
$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,
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] };
+ foreach my $letter (qw/a b c/){
+ push @field_data, { term => "marclist$letter" , val => $query->param("marclist$letter") || ''};
+ push @field_data, { term => "and_or$letter" , val => $query->param("and_or$letter") || ''};
+ push @field_data, { term => "excluding$letter" , val => $query->param("excluding$letter") || ''};
+ push @field_data, { term => "operator$letter" , val => $query->param("operator$letter") || ''};
+ push @field_data, { term => "value$letter" , val => $query->param("value$letter") || ''};
}
my @numbers = ();
}
$template->param( result => $results ) if $results;
$template->param( FIELDS => \@fields );
+ $template->param( orderby => $orderby );
$template->param(
startfrom => $startfrom,
displaynext => $displaynext,
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(
projects / koha.git / blobdiff