[Koha-cvs] CVS: koha loadmodules.pl,1.11,1.12

[Paul POULAIN]

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

Modified Files:
        loadmodules.pl 
Log Message:
Road to 1.9.1 :
* loadmodule.pl manages cataloguing link too

Index: loadmodules.pl
===================================================================
RCS file: /cvsroot/koha/koha/loadmodules.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** loadmodules.pl      6 Feb 2003 07:11:09 -0000       1.11
--- loadmodules.pl      13 Feb 2003 18:02:10 -0000      1.12
***************
*** 32,35 ****
--- 32,36 ----
        if ($module eq 'acquisitions') { acquisitions(); last SWITCH; }
        if ($module eq 'search') { catalogue_search(); last SWITCH; }
+       if ($module eq 'cataloguing') {cataloguing(); last SWITCH; }
        if ($module eq 'somethingelse') { somethingelse(); last SWITCH; }
  }
***************
*** 46,52 ****
                print 
$input->redirect("/cgi-bin/koha/acqui.simple/addbooks.pl");
        } elsif ($aq_type eq 'normal') {
!               print $input ->redirect("/acquisitions");
        } else {
!               print $input ->redirect("/acquisitions");
        }
  }
--- 47,53 ----
                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");
        }
  }
***************
*** 59,62 ****
--- 60,75 ----
        if ($marc_p) {
                print 
$input->redirect("/cgi-bin/koha/search.marc/search.pl?type=$type");
+       } else {
+               print $input ->redirect("/cgi-bin/koha/catalogue-home.pl");
+       }
+ }
+ 
+ sub cataloguing {
+       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/catalogue-home.pl");