[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/admin authorised_values.pl,NONE,1.1 marc_subfields_
|
From: |
Paul POULAIN |
|
Subject: |
[Koha-cvs] CVS: koha/admin authorised_values.pl,NONE,1.1 marc_subfields_structure.pl,1.2,1.3 |
|
Date: |
Fri, 25 Oct 2002 03:55:49 -0700 |
Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv15970/admin
Modified Files:
marc_subfields_structure.pl
Added Files:
authorised_values.pl
Log Message:
Road to 1.3.2
* bugfixes and improvements
* manage mandatory MARC subfields
* new table : authorised_values. this table contains categories and authorised
values for the category. On MARC management, you can map a subfield to a
authorised_values category. If you do this, the subfield can only be filled
with a authorised_value of the selected category.
this submit contains everything needed :
* updatedatabase
* admin screens
* "links" management
* creation of a html-list if a subfield is mapped to an authorised value.
Note this is different from authorities support, which will come soon.
The authorised_values is supposed to contains a "small" number of authorised
values for a category (less than 50-100). If you enter more authorised values
than this, it should be hard to find what you want in a BIG list...
--- NEW FILE ---
#!/usr/bin/perl
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# 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
use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Search;
use HTML::Template;
use C4::Context;
sub StringSearch {
my ($env,$searchstring,$type)address@hidden;
my $dbh = C4::Context->dbh;
$searchstring=~ s/\'/\\\'/g;
my @data=split(' ',$searchstring);
my address@hidden;
my $query="Select id,category,authorised_value from authorised_values
where (category like \"$data[0]%\") order by category,authorised_value";
my $sth=$dbh->prepare($query);
$sth->execute;
my @results;
my $cnt=0;
while (my $data=$sth->fetchrow_hashref){
push(@results,$data);
$cnt ++;
}
$sth->finish;
return ($cnt,address@hidden);
}
my $input = new CGI;
my $searchfield=$input->param('searchfield');
$searchfield=~ s/\,//g;
my $id = $input->param('id');
my $reqsel="select category,authorised_value from authorised_values where
id='$id'";
my $reqdel="delete from authorised_values where id='$id'";
my $offset=$input->param('offset');
my $script_name="/cgi-bin/koha/admin/authorised_values.pl";
my $dbh = C4::Context->dbh;
my $template = gettemplate("parameters/authorised_values.tmpl",0);
my $pagesize=20;
my $op = $input->param('op');
if ($op) {
$template->param(script_name => $script_name,
$op => 1); # we
show only the TMPL_VAR names $op
} else {
$template->param(script_name => $script_name,
else => 1); # we
show only the TMPL_VAR names $op
}
################## ADD_FORM ##################################
# called by default. Used to create form to add or modify a record
if ($op eq 'add_form') {
my $data;
if ($id) {
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("select id,category,authorised_value from
authorised_values where id='$id'");
$sth->execute;
$data=$sth->fetchrow_hashref;
$sth->finish;
} else {
$data->{'category'} = $input->param('category');
}
if ($searchfield) {
$template->param(action => "Modify authorised value");
} else {
$template->param(action => "Add authorised value");
}
$template->param(category => $data->{'category'},
authorised_value =>
$data->{'authorised_value'},
id => $data->{'id'}
);
if ($data->{'category'}) {
$template->param(category => "<input type=\"hidden\"
name=\"category\" value='$data->{'category'}'>$data->{'category'}");
} else {
$template->param(category => "<input type=text
name=\"category\" size=8 maxlength=8>");
}
################## ADD_VALIDATE ##################################
# called by add_form, used to insert/modify data in DB
} elsif ($op eq 'add_validate') {
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("replace authorised_values
(id,category,authorised_value) values (?,?,?)");
warn "TOTO : ".$input->param('id'), $input->param('category'),
$input->param('authorised_value');
$sth->execute($input->param('id'), $input->param('category'),
$input->param('authorised_value'));
$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') {
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare($reqsel);
$sth->execute;
my $data=$sth->fetchrow_hashref;
$sth->finish;
$template->param(searchfield => $searchfield,
Tvalue =>
$data->{'authorised_value'},
id =>$id,
);
# END $OP eq DELETE_CONFIRM
################## DELETE_CONFIRMED ##################################
# called by delete_confirm, used to effectively confirm deletion of data in DB
} elsif ($op eq 'delete_confirmed') {
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare($reqdel);
$sth->execute;
$sth->finish;
print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0;
URL=authorised_values.pl?searchfield=$searchfield\"></html>";
exit;
# END $OP eq DELETE_CONFIRMED
################## DEFAULT ##################################
} else { # DEFAULT
# build categories list
my $sth = $dbh->prepare("select distinct category from
authorised_values");
$sth->execute;
my @category_list;
while ( my ($category) = $sth->fetchrow_array) {
push(@category_list,$category);
}
my $tab_list = CGI::scrolling_list(-name=>'searchfield',
-values=> address@hidden,
-default=>"",
-size=>1,
-multiple=>0,
);
if (!$searchfield) {
$searchfield=$category_list[0];
}
my $env;
my ($count,$results)=StringSearch($env,$searchfield,'web');
my $toggle="white";
my @loop_data = ();
# builds value list
for (my $i=$offset; $i <
($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
if ($toggle eq 'white'){
$toggle="#ffffcc";
} else {
$toggle="white";
}
my %row_data; # get a fresh hash for the row data
$row_data{category} = $results->[$i]{'category'};
$row_data{authorised_value} =
$results->[$i]{'authorised_value'};
$row_data{edit} =
"$script_name?op=add_form&id=".$results->[$i]{'id'};
$row_data{delete} =
"$script_name?op=delete_confirm&searchfield=$searchfield&id=".$results->[$i]{'id'};
push(@loop_data, \%row_data);
}
$template->param(loop => address@hidden,
tab_list => $tab_list,
category =>
$searchfield);
if ($offset>0) {
my $prevpage = $offset-$pagesize;
$template->param("<a
href=$script_name?offset=".$prevpage.'<< Prev</a>');
}
if ($offset+$pagesize<$count) {
my $nextpage =$offset+$pagesize;
$template->param("a href=$script_name?offset=".$nextpage.'Next
>></a>');
}
} #---- END $OP eq DEFAULT
print "Content-Type: text/html\n\n", $template->output;
Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** marc_subfields_structure.pl 11 Oct 2002 09:19:58 -0000 1.2
--- marc_subfields_structure.pl 25 Oct 2002 10:55:47 -0000 1.3
***************
*** 32,36 ****
my @data=split(' ',$searchstring);
my address@hidden;
! my $query="Select
tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab
from marc_subfield_structure where (tagfield like \"$searchstring%\") order by
tagfield";
my $sth=$dbh->prepare($query);
$sth->execute;
--- 32,36 ----
my @data=split(' ',$searchstring);
my address@hidden;
! my $query="Select
tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,
authorised_value from marc_subfield_structure where (tagfield like
\"$searchstring%\") order by tagfield";
my $sth=$dbh->prepare($query);
$sth->execute;
***************
*** 51,55 ****
my $tagsubfield=$input->param('tagsubfield');
my $pkfield="tagfield";
! my $reqsel="select
tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab
from marc_subfield_structure where tagfield='$tagfield'";
my $reqdel="delete from marc_subfield_structure where tagfield='$tagfield'
and tagsubfield='$tagsubfield'";
my $offset=$input->param('offset');
--- 51,55 ----
my $tagsubfield=$input->param('tagsubfield');
my $pkfield="tagfield";
! my $reqsel="select
tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value
from marc_subfield_structure where tagfield='$tagfield'";
my $reqdel="delete from marc_subfield_structure where tagfield='$tagfield'
and tagsubfield='$tagsubfield'";
my $offset=$input->param('offset');
***************
*** 76,80 ****
my $data;
my $dbh = C4::Context->dbh;
! my $sth=$dbh->prepare("select
tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab
from marc_subfield_structure where tagfield='$tagfield'"); # and
tagsubfield='$tagsubfield'");
$sth->execute;
# builds kohafield tables
--- 76,80 ----
my $data;
my $dbh = C4::Context->dbh;
! my $sth=$dbh->prepare("select
tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value
from marc_subfield_structure where tagfield='$tagfield'"); # and
tagsubfield='$tagsubfield'");
$sth->execute;
# builds kohafield tables
***************
*** 96,99 ****
--- 96,108 ----
push @kohafields, "items.".$field;
}
+ # buiild authorised value list
+ $sth2->finish;
+ $sth2 = $dbh->prepare("select distinct category from
authorised_values");
+ $sth2->execute;
+ my @authorised_values;
+ push @authorised_values,"";
+ while ((my $category) = $sth2->fetchrow_array) {
+ push @authorised_values, $category;
+ }
$template->param(action => "Edit subfields",
tagfield => "<input
type=hidden name=tagfield value='$tagfield'>$tagfield",
***************
*** 101,104 ****
--- 110,114 ----
my @loop_data = ();
my $toggle="white";
+ my $i=0;
while ($data =$sth->fetchrow_hashref) {
my %row_data; # get a fresh hash for the row data
***************
*** 108,114 ****
$toggle="white";
}
! $row_data{tab} = CGI::scrolling_list(-name=>'tab[]',
!
-values=>['','0','1','2','3','4','5','6','7','8','9','10'],
! -labels => {'' =>'','0'=>'0','1'=>'1',
'2'
=>'2','3'=>'3','4'=>'4',
'5'
=>'5','6'=>'6','7'=>'7',
--- 118,124 ----
$toggle="white";
}
! $row_data{tab} = CGI::scrolling_list(-name=>'tab',
!
-values=>['-1','0','1','2','3','4','5','6','7','8','9','10'],
! -labels => {'-1'
=>'ignore','0'=>'0','1'=>'1',
'2'
=>'2','3'=>'3','4'=>'4',
'5'
=>'5','6'=>'6','7'=>'7',
***************
*** 119,126 ****
-multiple=>0,
);
! $row_data{tagsubfield} =$data->{'tagsubfield'}."<input
type='hidden' name='tagsubfield[]' value='".$data->{'tagsubfield'}."'>";
$row_data{liblibrarian} = $data->{'liblibrarian'};
$row_data{libopac} = $data->{'libopac'};
! $row_data{kohafield}= CGI::scrolling_list( -name=>'kohafield[]',
-values=> address@hidden,
-default=> "$data->{'kohafield'}",
--- 129,136 ----
-multiple=>0,
);
! $row_data{tagsubfield} =$data->{'tagsubfield'}."<input
type='hidden' name='tagsubfield' value='".$data->{'tagsubfield'}."'>";
$row_data{liblibrarian} = $data->{'liblibrarian'};
$row_data{libopac} = $data->{'libopac'};
! $row_data{kohafield}= CGI::scrolling_list( -name=>"kohafield",
-values=> address@hidden,
-default=> "$data->{'kohafield'}",
***************
*** 128,151 ****
-multiple=>0,
);
# $row_data{kohafield} = $data->{'kohafield'};
! $row_data{repeatable} =
CGI::checkbox('repeatable[]',$data->{'repeatable'}?'checked':'',1,'');
! $row_data{mandatory} =
CGI::checkbox('mandatory[]',$data->{'mandatory'}?'checked':'',1,'');
$row_data{bgcolor} = $toggle;
push(@loop_data, \%row_data);
}
# add an empty line for add if needed
my %row_data; # get a fresh hash for the row data
! $row_data{tab} = CGI::scrolling_list(-name=>'tab[]',
!
-values=>['','0','1','2','3','4','5','6','7','8','9','items (10)'],
-default=>"",
-size=>1,
-multiple=>0,
);
! $row_data{tagsubfield} = "<input type='text'
name='tagsubfield[]' value='".$data->{'tagsubfield'}."' size=3 maxlength=1>";
$row_data{liblibrarian} = "";
$row_data{libopac} = "";
! $row_data{repeatable} = CGI::checkbox('repeatable[]','',1,'');
! $row_data{mandatory} = CGI::checkbox('mandatory[]','',1,'');
! $row_data{kohafield}= CGI::scrolling_list( -name=>'kohafield[]',
-values=> address@hidden,
-default=> "",
--- 138,173 ----
-multiple=>0,
);
+ $row_data{authorised_value} =
CGI::scrolling_list(-name=>'authorised_value',
+ -values=> address@hidden,
+ -default=>$data->{'authorised_value'},
+ -size=>1,
+ -multiple=>0,
+ );
# $row_data{kohafield} = $data->{'kohafield'};
! $row_data{repeatable} =
CGI::checkbox("repeatable$i",$data->{'repeatable'}?'checked':'',1,'');
! $row_data{mandatory} =
CGI::checkbox("mandatory$i",$data->{'mandatory'}?'checked':'',1,'');
$row_data{bgcolor} = $toggle;
push(@loop_data, \%row_data);
+ $i++;
}
# add an empty line for add if needed
my %row_data; # get a fresh hash for the row data
! $row_data{tab} = CGI::scrolling_list(-name=>'tab',
!
-values=>['-1','0','1','2','3','4','5','6','7','8','9','10'],
! -labels => {'-1'
=>'ignore','0'=>'0','1'=>'1',
! '2'
=>'2','3'=>'3','4'=>'4',
! '5'
=>'5','6'=>'6','7'=>'7',
! '8'
=>'8','9'=>'9','10'=>'items (10)',
! },
-default=>"",
-size=>1,
-multiple=>0,
);
! $row_data{tagsubfield} = "<input type='text' name='tagsubfield'
value='".$data->{'tagsubfield'}."' size=3 maxlength=1>";
$row_data{liblibrarian} = "";
$row_data{libopac} = "";
! $row_data{repeatable} = CGI::checkbox('repeatable','',1,'');
! $row_data{mandatory} = CGI::checkbox('mandatory','',1,'');
! $row_data{kohafield}= CGI::scrolling_list( -name=>'kohafield',
-values=> address@hidden,
-default=> "",
***************
*** 153,156 ****
--- 175,183 ----
-multiple=>0,
);
+ $row_data{authorised_value} =
CGI::scrolling_list(-name=>'authorised_value',
+ -values=> address@hidden,
+ -size=>1,
+ -multiple=>0,
+ );
$row_data{bgcolor} = $toggle;
push(@loop_data, \%row_data);
***************
*** 164,176 ****
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)
! values
(?,?,?,?,?,?,?,?)");
! my @tagsubfield = $input->param('tagsubfield[]');
! my @liblibrarian = $input->param('liblibrarian[]');
! my @libopac = $input->param('libopac[]');
! my @repeatable = $input->param('repeatable[]');
! my @mandatory = $input->param('mandatory[]');
! my @kohafield = $input->param('kohafield[]');
! my @tab = $input->param('tab[]');
for (my $i=0; $i<= $#tagsubfield ; $i++) {
my $tagfield =$input->param('tagfield');
--- 191,202 ----
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,authorised_value)
! values
(?,?,?,?,?,?,?,?,?)");
! my @tagsubfield = $input->param('tagsubfield');
! my @liblibrarian = $input->param('liblibrarian');
! my @libopac = $input->param('libopac');
! my @kohafield = $input->param('kohafield');
! my @tab = $input->param('tab');
! my @authorised_values = $input->param('authorised_value');
for (my $i=0; $i<= $#tagsubfield ; $i++) {
my $tagfield =$input->param('tagfield');
***************
*** 178,185 ****
my $liblibrarian =$liblibrarian[$i];
my $libopac =$libopac[$i];
! my $repeatable =$repeatable[$i]?1:0;
! my $mandatory =$mandatory[$i]?1:0;
my $kohafield =$kohafield[$i];
my $tab =$tab[$i];
if ($tagsubfield) {
$sth->execute ($tagfield,
--- 204,212 ----
my $liblibrarian =$liblibrarian[$i];
my $libopac =$libopac[$i];
! my $repeatable =$input->param("repeatable$i")?1:0;
! my $mandatory =$input->param("mandatory$i")?1:0;
my $kohafield =$kohafield[$i];
my $tab =$tab[$i];
+ my $authorised_value =$authorised_values[$i];
if ($tagsubfield) {
$sth->execute ($tagfield,
***************
*** 190,194 ****
$mandatory,
$kohafield,
! $tab);
}
}
--- 217,222 ----
$mandatory,
$kohafield,
! $tab,
!
$authorised_value);
}
}
***************
*** 244,247 ****
--- 272,276 ----
$row_data{mandatory} = $results->[$i]{'mandatory'};
$row_data{tab} = $results->[$i]{'tab'};
+ $row_data{authorised_value} =
$results->[$i]{'authorised_value'};
$row_data{delete} =
"$script_name?op=delete_confirm&tagfield=$tagfield&tagsubfield=".$results->[$i]{'tagsubfield'};
$row_data{bgcolor} = $toggle;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/admin authorised_values.pl,NONE,1.1 marc_subfields_structure.pl,1.2,1.3,
Paul POULAIN <=
- Prev by Date:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters authorised_values.tmpl,NONE,1.1 admin-home.tmpl,1.2,1.3 marc_subfields_structure.tmpl,1.3,1.4
- Next by Date:
[Koha-cvs] CVS: koha/updater updatedatabase,1.4.2.21,1.4.2.22
- Previous by thread:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters authorised_values.tmpl,NONE,1.1 admin-home.tmpl,1.2,1.3 marc_subfields_structure.tmpl,1.3,1.4
- Next by thread:
[Koha-cvs] CVS: koha/updater updatedatabase,1.4.2.21,1.4.2.22
- Index(es):