[Koha-cvs] CVS: koha/admin authorised_values.pl,1.13,1.14 marc_subfields_structure.pl,1.18,1.19

[Paul POULAIN]

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

Modified Files:
        authorised_values.pl marc_subfields_structure.pl 
Log Message:
synch'ing with 2.0 branch

Index: authorised_values.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/authorised_values.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** authorised_values.pl        11 Mar 2004 05:42:56 -0000      1.13
--- authorised_values.pl        16 Mar 2004 13:40:22 -0000      1.14
***************
*** 63,67 ****
                             debug => 1,
                             });
! my $pagesize=5;
  my $op = $input->param('op');
  
--- 63,67 ----
                             debug => 1,
                             });
! my $pagesize=20;
  my $op = $input->param('op');
  

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** marc_subfields_structure.pl 12 Jan 2004 16:55:05 -0000      1.18
--- marc_subfields_structure.pl 16 Mar 2004 13:40:22 -0000      1.19
***************
*** 34,38 ****
        my @data=split(' ',$searchstring);
        my address@hidden;
!       my $sth=$dbh->prepare("Select 
tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,thesaurus_category,value_builder
 from marc_subfield_structure where (tagfield like ?) order by tagfield");
        $sth->execute("$searchstring%");
        my @results;
--- 34,38 ----
        my @data=split(' ',$searchstring);
        my address@hidden;
!       my $sth=$dbh->prepare("Select 
tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,thesaurus_category,value_builder
 from marc_subfield_structure where (tagfield like ?) order by tagfield");
        $sth->execute("$searchstring%");
        my @results;
***************
*** 138,142 ****
  
        # build values list
!       my $sth=$dbh->prepare("select 
tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,thesaurus_category,value_builder
 from marc_subfield_structure where tagfield=?"); # and 
tagsubfield='$tagsubfield'");
        $sth->execute($tagfield);
        my @loop_data = ();
--- 138,142 ----
  
        # build values list
!       my $sth=$dbh->prepare("select 
tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,thesaurus_category,value_builder
 from marc_subfield_structure where tagfield=?"); # and 
tagsubfield='$tagsubfield'");
        $sth->execute($tagfield);
        my @loop_data = ();
***************
*** 164,167 ****
--- 164,168 ----
                $row_data{liblibrarian} = 
CGI::escapeHTML($data->{'liblibrarian'});
                $row_data{libopac} = CGI::escapeHTML($data->{'libopac'});
+               $row_data{seealso} = CGI::escapeHTML($data->{'seealso'});
                $row_data{kohafield}= CGI::scrolling_list( -name=>"kohafield",
                                        -values=> address@hidden,
***************
*** 188,192 ****
                                        -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,'');
--- 189,192 ----
***************
*** 212,215 ****
--- 212,216 ----
                $row_data{liblibrarian} = "";
                $row_data{libopac} = "";
+               $row_data{seealso} = "";
                $row_data{repeatable} = CGI::checkbox('repeatable','',1,'');
                $row_data{mandatory} = CGI::checkbox('mandatory','',1,'');
***************
*** 245,250 ****
        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,thesaurus_category,value_builder)
!                                                                       values 
(?,?,?,?,?,?,?,?,?,?,?)");
        my @tagsubfield = $input->param('tagsubfield');
        my @liblibrarian        = $input->param('liblibrarian');
--- 246,251 ----
        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,thesaurus_category,value_builder)
!                                                                       values 
(?,?,?,?,?,?,?,?,?,?,?,?)");
        my @tagsubfield = $input->param('tagsubfield');
        my @liblibrarian        = $input->param('liblibrarian');
***************
*** 252,255 ****
--- 253,257 ----
        my @kohafield           = $input->param('kohafield');
        my @tab                         = $input->param('tab');
+       my @seealso             = $input->param('seealso');
        my @authorised_values   = $input->param('authorised_value');
        my @thesaurus_category  = $input->param('thesaurus_category');
***************
*** 265,268 ****
--- 267,271 ----
                my $kohafield           =$kohafield[$i];
                my $tab                         =$tab[$i];
+               my $seealso                             =$seealso[$i];
                my $authorised_value            =$authorised_values[$i];
                my $thesaurus_category          =$thesaurus_category[$i];
***************
*** 278,281 ****
--- 281,285 ----
                                                                        
$kohafield,
                                                                        $tab,
+                                                                       
$seealso,
                                                                        
$authorised_value,
                                                                        
$thesaurus_category,
***************
*** 337,340 ****
--- 341,345 ----
                $row_data{mandatory} = $results->[$i]{'mandatory'};
                $row_data{tab} = $results->[$i]{'tab'};
+               $row_data{seealso} = $results->[$i]{'seealso'};
                $row_data{authorised_value} = 
$results->[$i]{'authorised_value'};
                $row_data{thesaurus_category}   = 
$results->[$i]{'thesaurus_category'};