[Koha-cvs] CVS: koha/admin auth_subfields_structure.pl,1.3,1.4 auth_tag_structure.pl,1.2,1.3 marc_subfields_structure.pl,1.35,1.36 marctagstructure.pl,1.27,1.28

[Paul POULAIN]

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20915/admin

Modified Files:
        auth_subfields_structure.pl auth_tag_structure.pl 
        marc_subfields_structure.pl marctagstructure.pl 
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits 
done here

Index: auth_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/auth_subfields_structure.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** auth_subfields_structure.pl 10 Jun 2004 08:58:34 -0000      1.3
--- auth_subfields_structure.pl 1 Mar 2005 13:40:50 -0000       1.4
***************
*** 200,204 ****
                my $tagfield                    =$input->param('tagfield');
                my $tagsubfield         =$tagsubfield[$i];
!               $tagsubfield="@" unless $tagsubfield;
                my $liblibrarian                =$liblibrarian[$i];
                my $libopac                     =$libopac[$i];
--- 200,204 ----
                my $tagfield                    =$input->param('tagfield');
                my $tagsubfield         =$tagsubfield[$i];
!               $tagsubfield="@" unless $tagsubfield ne '';
                my $liblibrarian                =$liblibrarian[$i];
                my $libopac                     =$libopac[$i];

Index: auth_tag_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/auth_tag_structure.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** auth_tag_structure.pl       10 Jun 2004 08:58:34 -0000      1.2
--- auth_tag_structure.pl       1 Mar 2005 13:40:50 -0000       1.3
***************
*** 174,177 ****
--- 174,178 ----
        $template->param(liblibrarian => $data->{'liblibrarian'},
                                                        searchfield => 
$searchfield,
+                                                       authtypecode => 
$authtypecode,
                                                        );
                                                                                
                        # END $OP eq DELETE_CONFIRM
***************
*** 180,185 ****
  } elsif ($op eq 'delete_confirmed') {
        unless (C4::Context->config('demo') eq 1) {
!               $dbh->do("delete from auth_tag_structure where 
tagfield='$searchfield'");
!               $dbh->do("delete from auth_subfield_structure where 
tagfield='$searchfield'");
        }
                                                                                
                        # END $OP eq DELETE_CONFIRMED
--- 181,186 ----
  } elsif ($op eq 'delete_confirmed') {
        unless (C4::Context->config('demo') eq 1) {
!               $dbh->do("delete from auth_tag_structure where 
tagfield='$searchfield' and authtypecode='$authtypecode'");
!               $dbh->do("delete from auth_subfield_structure where 
tagfield='$searchfield' and authtypecode='$authtypecode'");
        }
                                                                                
                        # END $OP eq DELETE_CONFIRMED

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** marc_subfields_structure.pl 14 Feb 2005 22:07:59 -0000      1.35
--- marc_subfields_structure.pl 1 Mar 2005 13:40:50 -0000       1.36
***************
*** 110,114 ****
        push @kohafields, "additionalauthors.author";
        push @kohafields, "bibliosubject.subject";
!       push @kohafields, "bibliosubtitle.title";
        # build authorised value list
        $sth2->finish;
--- 110,114 ----
        push @kohafields, "additionalauthors.author";
        push @kohafields, "bibliosubject.subject";
!       push @kohafields, "bibliosubtitle.subtitle";
        # build authorised value list
        $sth2->finish;
***************
*** 325,329 ****
                my $tagfield                    =$input->param('tagfield');
                my $tagsubfield         =$tagsubfield[$i];
!               $tagsubfield="@" unless $tagsubfield;
                my $liblibrarian                =$liblibrarian[$i];
                my $libopac                     =$libopac[$i];
--- 325,329 ----
                my $tagfield                    =$input->param('tagfield');
                my $tagsubfield         =$tagsubfield[$i];
!               $tagsubfield="@" unless $tagsubfield ne '';
                my $liblibrarian                =$liblibrarian[$i];
                my $libopac                     =$libopac[$i];
***************
*** 435,439 ****
        $template->param(edit_tagfield => $tagfield,
                edit_frameworkcode => $frameworkcode);
!               
        if ($offset>0) {
                my $prevpage = $offset-$pagesize;
--- 435,439 ----
        $template->param(edit_tagfield => $tagfield,
                edit_frameworkcode => $frameworkcode);
!       
        if ($offset>0) {
                my $prevpage = $offset-$pagesize;

Index: marctagstructure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** marctagstructure.pl 11 Feb 2005 19:59:41 -0000      1.27
--- marctagstructure.pl 1 Mar 2005 13:40:50 -0000       1.28
***************
*** 134,139 ****
        $template->param('use-heading-flags-p' => 1);
        $template->param(liblibrarian => $data->{'liblibrarian'},
!                                                       libopac => 
$data->{'libopac'},
!                                                       repeatable => 
CGI::checkbox(-name=>'repeatable',
                                                -checked=> 
$data->{'repeatable'}?'checked':'',
                                                -value=> 1,
--- 134,139 ----
        $template->param('use-heading-flags-p' => 1);
        $template->param(liblibrarian => $data->{'liblibrarian'},
!                       libopac => $data->{'libopac'},
!                       repeatable => CGI::checkbox(-name=>'repeatable',
                                                -checked=> 
$data->{'repeatable'}?'checked':'',
                                                -value=> 1,
***************
*** 145,151 ****
                                                -label => '',
                                                -id => 'mandatory'),
!                                                       authorised_value => 
$authorised_value,
!                                                       frameworkcode => 
$frameworkcode,
!                                                       );
                                                                                
                        # END $OP eq ADD_FORM
  ################## ADD_VALIDATE ##################################
--- 145,151 ----
                                                -label => '',
                                                -id => 'mandatory'),
!                       authorised_value => $authorised_value,
!                       frameworkcode => $frameworkcode,
!                       );
                                                                                
                        # END $OP eq ADD_FORM
  ################## ADD_VALIDATE ##################################
***************
*** 219,229 ****
        my $env;
        my ($count,$results)=StringSearch($env,$searchfield,$frameworkcode);
!       my $toggle="white";
        my @loop_data = ();
        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
--- 219,229 ----
        my $env;
        my ($count,$results)=StringSearch($env,$searchfield,$frameworkcode);
!       my $toggle=0;
        my @loop_data = ();
        for (my $i=$offset; $i < 
($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
!               if ($toggle eq 0){
!                       $toggle=1;
                } else {
!                       $toggle=0;
                }
                my %row_data;  # get a fresh hash for the row data
***************
*** 233,237 ****
                $row_data{mandatory} = $results->[$i]{'mandatory'};
                $row_data{authorised_value} = 
$results->[$i]{'authorised_value'};
!               $row_data{bgcolor} = $toggle;
                push(@loop_data, \%row_data);
        }
--- 233,240 ----
                $row_data{mandatory} = $results->[$i]{'mandatory'};
                $row_data{authorised_value} = 
$results->[$i]{'authorised_value'};
!               $row_data{subfield_link} 
="marc_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
!               $row_data{edit} = 
"$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
!               $row_data{delete} = 
"$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
!               $row_data{toggle} = $toggle;
                push(@loop_data, \%row_data);
        }