use strict;
use C4::Output;
-use C4::Interface::CGI::Output;
use C4::Auth;
use CGI;
use C4::Context;
-sub StringSearch {
- my ( $env, $searchstring, $frameworkcode ) = @_;
+sub string_search {
+ my ( $searchstring, $frameworkcode ) = @_;
my $dbh = C4::Context->dbh;
$searchstring =~ s/\'/\\\'/g;
my @data = split( ' ', $searchstring );
return ( $cnt, \@results );
}
+sub marc_subfield_structure_exists {
+ my ($tagfield, $tagsubfield, $frameworkcode) = @_;
+ my $dbh = C4::Context->dbh;
+ my $sql = "select tagfield from marc_subfield_structure where tagfield = ? and tagsubfield = ? and frameworkcode = ?";
+ my $rows = $dbh->selectall_arrayref($sql, {}, $tagfield, $tagsubfield, $frameworkcode);
+ return @$rows > 0;
+}
+
my $input = new CGI;
my $tagfield = $input->param('tagfield');
my $tagsubfield = $input->param('tagsubfield');
while ( ( my $field ) = $sth2->fetchrow_array ) {
push @kohafields, "biblio." . $field;
}
- my $sth2 = $dbh->prepare("SHOW COLUMNS from biblioitems");
+ $sth2 = $dbh->prepare("SHOW COLUMNS from biblioitems");
$sth2->execute;
while ( ( my $field ) = $sth2->fetchrow_array ) {
if ( $field eq 'notes' ) { $field = 'bnotes'; }
push @kohafields, "biblioitems." . $field;
}
- my $sth2 = $dbh->prepare("SHOW COLUMNS from items");
+ $sth2 = $dbh->prepare("SHOW COLUMNS from items");
$sth2->execute;
while ( ( my $field ) = $sth2->fetchrow_array ) {
push @kohafields, "items." . $field;
}
push( @authorised_values, "branches" );
push( @authorised_values, "itemtypes" );
+ push( @authorised_values, "cn_source" );
# build thesaurus categories list
$sth2->finish;
push( @value_builder, $line );
}
}
+ @value_builder= sort {$a cmp $b} @value_builder;
closedir DIR;
# build values list
); # and tagsubfield='$tagsubfield'");
$sth->execute( $tagfield, $frameworkcode );
my @loop_data = ();
- my $toggle = 1;
my $i = 0;
while ( $data = $sth->fetchrow_hashref ) {
my %row_data; # get a fresh hash for the row data
- if ( $toggle eq 1 ) {
- $toggle = 0;
- }
- else {
- $toggle = 1;
- }
$row_data{defaultvalue} = $data->{defaultvalue};
$row_data{tab} = CGI::scrolling_list(
-name => 'tab',
},
-default => $data->{'tab'},
-size => 1,
- -tabindex => '',
-multiple => 0,
);
$row_data{tagsubfield} =
$data->{'tagsubfield'}
. "<input type=\"hidden\" name=\"tagsubfield\" value=\""
. $data->{'tagsubfield'}
- . "\" id=\"tagsubfield\">";
- $row_data{subfieldcode} = $data->{'tagsubfield'};
+ . "\" id=\"tagsubfield\" />";
+ $row_data{subfieldcode} = $data->{'tagsubfield'} eq '@'?'_':$data->{'tagsubfield'};
+ $row_data{urisubfieldcode} = $row_data{subfieldcode} eq '%' ? 'pct' : $row_data{subfieldcode};
$row_data{liblibrarian} = CGI::escapeHTML( $data->{'liblibrarian'} );
$row_data{libopac} = CGI::escapeHTML( $data->{'libopac'} );
$row_data{seealso} = CGI::escapeHTML( $data->{'seealso'} );
-values => \@kohafields,
-default => "$data->{'kohafield'}",
-size => 1,
- -tabindex => '',
-multiple => 0,
);
$row_data{authorised_value} = CGI::scrolling_list(
- -name => 'authorised_value',
- -id => 'authorised_value',
+ -name => "authorised_value",
+ -id => "authorised_value$i",
-values => \@authorised_values,
-default => $data->{'authorised_value'},
-size => 1,
- -tabindex => '',
-multiple => 0,
);
$row_data{value_builder} = CGI::scrolling_list(
- -name => 'value_builder',
- -id => 'value_builder',
+ -name => "value_builder",
+ -id => "value_builder$i",
-values => \@value_builder,
-default => $data->{'value_builder'},
-size => 1,
- -tabindex => '',
-multiple => 0,
);
$row_data{authtypes} = CGI::scrolling_list(
- -name => 'authtypecode',
- -id => 'authtypecode',
+ -name => "authtypecode",
+ -id => "authtypecode$i",
-values => \@authtypes,
-default => $data->{'authtypecode'},
-size => 1,
- -tabindex => '',
-multiple => 0,
);
$row_data{repeatable} = CGI::checkbox(
-name => "repeatable$i",
-checked => $data->{'repeatable'} ? 'checked' : '',
-value => 1,
- -tabindex => '',
-label => '',
-id => "repeatable$i"
);
$row_data{mandatory} = CGI::checkbox(
- -name => "mandatory$i",
+ -name => "mandatory",
-checked => $data->{'mandatory'} ? 'checked' : '',
-value => 1,
- -tabindex => '',
-label => '',
-id => "mandatory$i"
);
-id => "isurl$i",
-checked => $data->{'isurl'} ? 'checked' : '',
-value => 1,
- -tabindex => '',
-label => ''
);
$row_data{row} = $i;
- $row_data{toggle} = $toggle;
$row_data{link} = CGI::escapeHTML( $data->{'link'} );
push( @loop_data, \%row_data );
$i++;
}
# add more_subfields empty lines for add if needed
- for ( my $j = $i ; $j <= $more_subfields + $i ; $j++ ) {
+ for ( my $j = 1 ; $j <= 1 ; $j++ ) {
my %row_data; # get a fresh hash for the row data
+ $row_data{'new_subfield'} = 1;
+ $row_data{'subfieldcode'} = '';
+
$row_data{tab} = CGI::scrolling_list(
-name => 'tab',
-id => "tab$j",
},
-default => "",
-size => 1,
- -tabindex => '',
-multiple => 0,
);
$row_data{tagsubfield} =
"<input type=\"text\" name=\"tagsubfield\" value=\""
. $data->{'tagsubfield'}
- . "\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\">";
+ . "\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\" />";
$row_data{liblibrarian} = "";
$row_data{libopac} = "";
$row_data{seealso} = "";
-values => \@kohafields,
-default => "",
-size => 1,
- -tabindex => '',
-multiple => 0,
);
$row_data{hidden} = "";
-id => "repeatable$j",
-checked => '',
-value => 1,
- -tabindex => '',
-label => ''
);
$row_data{mandatory} = CGI::checkbox(
-id => "mandatory$j",
-checked => '',
-value => 1,
- -tabindex => '',
-label => ''
);
$row_data{isurl} = CGI::checkbox(
-id => "isurl$j",
-checked => '',
-value => 1,
- -tabindex => '',
-label => ''
);
$row_data{value_builder} = CGI::scrolling_list(
- -name => 'value_builder',
- -id => 'value_builder',
+ -name => "value_builder",
+ -id => "value_builder$j",
-values => \@value_builder,
-default => $data->{'value_builder'},
-size => 1,
- -tabindex => '',
-multiple => 0,
);
$row_data{authorised_value} = CGI::scrolling_list(
- -name => 'authorised_value',
- -id => 'authorised_value',
+ -name => "authorised_value",
+ -id => "authorised_value$j",
-values => \@authorised_values,
-size => 1,
- -tabindex => '',
-multiple => 0,
);
$row_data{authtypes} = CGI::scrolling_list(
- -name => 'authtypecode',
- -id => 'authtypecode',
+ -name => "authtypecode",
+ -id => "authtypecode$j",
-values => \@authtypes,
-size => 1,
- -tabindex => '',
-multiple => 0,
);
$row_data{link} = CGI::escapeHTML( $data->{'link'} );
- $row_data{toggle} = $toggle;
$row_data{row} = $j;
push( @loop_data, \%row_data );
}
$template->param( 'heading-edit-subfields-p' => 1 );
$template->param(
action => "Edit subfields",
- tagfield =>
-"<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\">$tagfield",
+ tagfield => $tagfield,
loop => \@loop_data,
more_subfields => $more_subfields,
more_tag => $tagfield
elsif ( $op eq 'add_validate' ) {
my $dbh = C4::Context->dbh;
$template->param( tagfield => "$input->param('tagfield')" );
- my $sth = $dbh->prepare(
-"replace marc_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,authtypecode,value_builder,hidden,isurl,frameworkcode, link,defaultvalue)
- values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"
- );
+# my $sth = $dbh->prepare(
+# "replace marc_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,authtypecode,value_builder,hidden,isurl,frameworkcode, link,defaultvalue)
+# values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"
+# );
+ my $sth_insert = $dbh->prepare(qq{
+ insert into marc_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,authtypecode,value_builder,hidden,isurl,frameworkcode, link,defaultvalue)
+ values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+ });
+ my $sth_update = $dbh->prepare(qq{
+ update marc_subfield_structure set tagfield=?, tagsubfield=?, liblibrarian=?, libopac=?, repeatable=?, mandatory=?, kohafield=?, tab=?, seealso=?, authorised_value=?, authtypecode=?, value_builder=?, hidden=?, isurl=?, frameworkcode=?, link=?, defaultvalue=?
+ where tagfield=? and tagsubfield=? and frameworkcode=?
+ });
my @tagsubfield = $input->param('tagsubfield');
my @liblibrarian = $input->param('liblibrarian');
my @libopac = $input->param('libopac');
my $tagfield = $input->param('tagfield');
my $tagsubfield = $tagsubfield[$i];
$tagsubfield = "@" unless $tagsubfield ne '';
+ $tagsubfield = "@" if $tagsubfield eq '_';
my $liblibrarian = $liblibrarian[$i];
my $libopac = $libopac[$i];
my $repeatable = $input->param("repeatable$i") ? 1 : 0;
if ($liblibrarian) {
unless ( C4::Context->config('demo') eq 1 ) {
- $sth->execute(
- $tagfield,
- $tagsubfield,
- $liblibrarian,
- $libopac,
- $repeatable,
- $mandatory,
- $kohafield,
- $tab,
- $seealso,
- $authorised_value,
- $authtypecode,
- $value_builder,
- $hidden,
- $isurl,
- $frameworkcode,
- $link,
- $defaultvalue,
- );
+ if (marc_subfield_structure_exists($tagfield, $tagsubfield, $frameworkcode)) {
+ $sth_update->execute(
+ $tagfield,
+ $tagsubfield,
+ $liblibrarian,
+ $libopac,
+ $repeatable,
+ $mandatory,
+ $kohafield,
+ $tab,
+ $seealso,
+ $authorised_value,
+ $authtypecode,
+ $value_builder,
+ $hidden,
+ $isurl,
+ $frameworkcode,
+ $link,
+ $defaultvalue,
+ (
+ $tagfield,
+ $tagsubfield,
+ $frameworkcode,
+ ),
+ );
+ } else {
+ $sth_insert->execute(
+ $tagfield,
+ $tagsubfield,
+ $liblibrarian,
+ $libopac,
+ $repeatable,
+ $mandatory,
+ $kohafield,
+ $tab,
+ $seealso,
+ $authorised_value,
+ $authtypecode,
+ $value_builder,
+ $hidden,
+ $isurl,
+ $frameworkcode,
+ $link,
+ $defaultvalue,
+ );
+ }
}
}
}
- $sth->finish;
+ $sth_insert->finish;
+ $sth_update->finish;
print
"Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=marc_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
exit;
"select * from marc_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?"
);
- #FIXME : called with 2 bind variables when 3 are needed
- $sth->execute( $tagfield, $tagsubfield );
+ $sth->execute( $tagfield, $tagsubfield, $frameworkcode );
my $data = $sth->fetchrow_hashref;
$sth->finish;
$template->param(
################## DEFAULT ##################################
}
else { # DEFAULT
- my $env;
- my ( $count, $results ) = StringSearch( $env, $tagfield, $frameworkcode );
- my $toggle = 1;
+ my ( $count, $results ) = string_search( $tagfield, $frameworkcode );
my @loop_data = ();
for (
my $i = $offset ;
$i++
)
{
- if ( $toggle eq 1 ) {
- $toggle = 0;
- }
- else {
- $toggle = 1;
- }
my %row_data; # get a fresh hash for the row data
$row_data{tagfield} = $results->[$i]{'tagfield'};
$row_data{tagsubfield} = $results->[$i]{'tagsubfield'};
$row_data{delete} =
"$script_name?op=delete_confirm&tagfield=$tagfield&tagsubfield="
. $results->[$i]{'tagsubfield'}
- . "&frameworkcode=$frameworkcode";
- $row_data{toggle} = $toggle;
+ . "&frameworkcode=$frameworkcode";
if ( $row_data{tab} eq -1 ) {
$row_data{subfield_ignored} = 1;
if ( $offset > 0 ) {
my $prevpage = $offset - $pagesize;
$template->param(
- prev => "<a href=\"$script_name?offset=$prevpage\">" );
+ prev => "<a href=\"$script_name?offset=$prevpage\&tagfield=$tagfield\&frameworkcode=$frameworkcode \">" );
}
if ( $offset + $pagesize < $count ) {
my $nextpage = $offset + $pagesize;
$template->param(
- next => "<a href=\"$script_name?offset=$nextpage\">" );
+ next => "<a href=\"$script_name?offset=$nextpage\&tagfield=$tagfield\&frameworkcode=$frameworkcode \">" );
}
} #---- END $OP eq DEFAULT
projects / koha.git / blobdiff