[Koha-cvs] CVS: koha loadmodules.pl,1.16,1.17

[Steve Tonnesen]

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1:/tmp/cvs-serv13520

Modified Files:
        loadmodules.pl 
Log Message:
Using boolean_preference() instead of preference() for 'marc' system pref.


Index: loadmodules.pl
===================================================================
RCS file: /cvsroot/koha/koha/loadmodules.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** loadmodules.pl      5 Jun 2003 12:27:08 -0000       1.16
--- loadmodules.pl      11 Jun 2003 18:34:43 -0000      1.17
***************
*** 40,45 ****
        $aq_type = C4::Context->preference("acquisitions") || "normal" unless 
$aq_type;
        my $marc_bool =$input->param('MARC');
!       $marc_bool = C4::Context->preference("MARC") ||"OFF" unless $marc_bool;
! 
        # Get the acquisition preference. This should be:
        #       "simple" - minimal information required
--- 40,44 ----
        $aq_type = C4::Context->preference("acquisitions") || "normal" unless 
$aq_type;
        my $marc_bool =$input->param('MARC');
!       $marc_bool = C4::Context->boolean_preference('marc') || 0 unless 
$marc_bool;
        # Get the acquisition preference. This should be:
        #       "simple" - minimal information required
***************
*** 48,52 ****
  
        if ($aq_type eq 'simple') {
!               if ($marc_bool eq "ON") {
                        print 
$input->redirect("/cgi-bin/koha/acqui.simple/addbooks.pl");
                } else {
--- 47,51 ----
  
        if ($aq_type eq 'simple') {
!               if ($marc_bool eq "1") {
                        print 
$input->redirect("/cgi-bin/koha/acqui.simple/addbooks.pl");
                } else {
***************
*** 59,64 ****
  
  sub addbiblio {
!       my $marc_bool = C4::Context->preference("MARC") ||"OFF";
!               if ($marc_bool eq "ON") {
                        print 
$input->redirect("/cgi-bin/koha/acqui.simple/addbooks.pl");
                } else {
--- 58,63 ----
  
  sub addbiblio {
!       my $marc_bool = C4::Context->boolean_preference("MARC") || 0;
!               if ($marc_bool eq "1") {
                        print 
$input->redirect("/cgi-bin/koha/acqui.simple/addbooks.pl");
                } else {