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

[Paul POULAIN]

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

Modified Files:
        loadmodules.pl 
Log Message:
gui reordering.
In loadmodule, now you can force a specific systempref.
removed MARC topic and added addbiblio topic.

Index: loadmodules.pl
===================================================================
RCS file: /cvsroot/koha/koha/loadmodules.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** loadmodules.pl      21 Apr 2003 04:30:33 -0000      1.15
--- loadmodules.pl      5 Jun 2003 12:27:08 -0000       1.16
***************
*** 32,58 ****
        if ($module eq 'acquisitions') { acquisitions(); last SWITCH; }
        if ($module eq 'search') { catalogue_search(); last SWITCH; }
!       if ($module eq 'MARC') {marc(); last SWITCH; }
        if ($module eq 'somethingelse') { somethingelse(); last SWITCH; }
  }
  
  sub acquisitions {
!     my $aq_type = C4::Context->preference("acquisitions") || "normal"; 
!     # Get the acquisition preference. This should be: 
!     #       "simple" - minimal information required 
!     #       "normal" - full information required 
!     #       other - Same as "normal" 
!      
!     if ($aq_type eq 'simple') { 
!       print $input->redirect("/cgi-bin/koha/acqui.simple/addbooks.pl"); 
!     } elsif ($aq_type eq 'normal') { 
!       print $input ->redirect("/cgi-bin/koha/acqui/acqui-home.pl"); 
!     } else {
!       print $input ->redirect("/cgi-bin/koha/acqui/acqui-home.pl");
!     }
  }
  
  sub catalogue_search {
!       my $marc_p = C4::Context->boolean_preference("marc");
!       $marc_p = 1 unless defined $marc_p;
        my $keyword=$input->param('keyword');
        my $query = new CGI;
--- 32,74 ----
        if ($module eq 'acquisitions') { acquisitions(); last SWITCH; }
        if ($module eq 'search') { catalogue_search(); last SWITCH; }
!       if ($module eq 'addbiblio') {addbiblio(); last SWITCH;}
        if ($module eq 'somethingelse') { somethingelse(); last SWITCH; }
  }
  
  sub acquisitions {
!       my $aq_type = $input->param('acquisitions');
!       $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
!       #       "normal" - full information required
!       #       other - Same as "normal"
! 
!       if ($aq_type eq 'simple') {
!               if ($marc_bool eq "ON") {
!                       print 
$input->redirect("/cgi-bin/koha/acqui.simple/addbooks.pl");
!               } else {
!                       print 
$input->redirect("/cgi-bin/koha/acqui.simple/addbiblio-nomarc.pl");
!               }
!       } else {
!               print $input ->redirect("/cgi-bin/koha/acqui/acqui-home.pl");
!       }
! }
! 
! 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 {
!                       print 
$input->redirect("/cgi-bin/koha/acqui.simple/addbiblio-nomarc.pl");
!               }
  }
  
  sub catalogue_search {
!       my $marc_p = $input->param('marc');
!       $marc_p = C4::Context->boolean_preference('marc') unless defined 
$marc_p;
!       $marc_p = 'ON' unless defined $marc_p;
        my $keyword=$input->param('keyword');
        my $query = new CGI;
***************
*** 71,86 ****
                }
        }
- }
- 
- sub marc {
- #     my $marc_p = C4::Context->boolean_preference("marc");
- #     $marc_p = 1 unless defined $marc_p;
- #     my $query = new CGI;
- #     my $type = $query->param('type');
- #     if ($marc_p) {
- #             print 
$input->redirect("/cgi-bin/koha/cataloguing.marc/cataloguing-home.pl");
- #     } else {
-               print $input 
->redirect("/cgi-bin/koha/acqui.simple/isbnsearch.pl");
- #     }
  }
  
--- 87,90 ----