From b50d23fa997eeeb51f2bc71ed698fb7210e95fcb Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Thu, 5 Jun 2008 12:26:40 -0500 Subject: [PATCH] removed 'AddStatement' op from authorities search The AddStatement op is an archaism from 2.2 that has not been used in the templates for at least a year. No documentation changes. Signed-off-by: Joshua Ferraro --- authorities/authorities-home.pl | 86 ----------------------------------------- opac/opac-authorities-home.pl | 84 ---------------------------------------- 2 files changed, 170 deletions(-) diff --git a/authorities/authorities-home.pl b/authorities/authorities-home.pl index 9ffd6e2ca5..428954c5e1 100755 --- a/authorities/authorities-home.pl +++ b/authorities/authorities-home.pl @@ -153,92 +153,6 @@ elsif ( $op eq "delete" ) { # $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, - -tabindex => '', - 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, - -tabindex => '', - onChange => "sql_update()" - } - ); - push @statements, { "marclist" => $marclist }; - - $template->param( - "statements" => \@statements, - "nbstatements" => $nbstatements - ); - -} else { ( $template, $loggedinuser, $cookie ) = get_template_and_user( { diff --git a/opac/opac-authorities-home.pl b/opac/opac-authorities-home.pl index 6284e81c29..18be48fb43 100755 --- a/opac/opac-authorities-home.pl +++ b/opac/opac-authorities-home.pl @@ -145,90 +145,6 @@ if ( $op eq "do_search" ) { ); } -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( { -- 2.11.0