[Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.10,1.11 addbooks.pl,1.15,1.16 additem.pl,1.9,1.10 isbnsearch.pl,1.5,1.6

[Paul POULAIN]

Update of /cvsroot/koha/koha/acqui.simple
In directory sc8-pr-cvs1:/tmp/cvs-serv28875/acqui.simple

Modified Files:
        addbiblio.pl addbooks.pl additem.pl isbnsearch.pl 
Log Message:
adding authentification with Auth.pm and
MAJOR BUGFIX on marc biblio modification

Index: addbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** addbiblio.pl        10 Dec 2002 13:29:09 -0000      1.10
--- addbiblio.pl        12 Dec 2002 16:34:41 -0000      1.11
***************
*** 20,25 ****
  # Suite 330, Boston, MA  02111-1307 USA
  
- use CGI;
  use strict;
  use C4::Output;
  use C4::Biblio;
--- 20,26 ----
  # Suite 330, Boston, MA  02111-1307 USA
  
  use strict;
+ use CGI;
+ use C4::Auth;
  use C4::Output;
  use C4::Biblio;
***************
*** 73,77 ****
        $bibid = $input->param('bibid');
  }
! my $template;
  
  my $tagslib = &MARCgettagslib($dbh,1);
--- 74,85 ----
        $bibid = $input->param('bibid');
  }
! my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "acqui.simple/addbiblio.tmpl",
!                            query => $input,
!                            type => "intranet",
!                            authnotrequired => 0,
!                            flagsrequired => {catalogue => 1},
!                            debug => 1,
!                            });
  
  my $tagslib = &MARCgettagslib($dbh,1);
***************
*** 116,120 ****
  } else {
  
#------------------------------------------------------------------------------------------------------------------------------
-       $template = gettemplate("acqui.simple/addbiblio.tmpl");
        # fill arrays
        my @loop_data =();
--- 124,127 ----
***************
*** 287,289 ****
                                                        oldbiblionumtagsubfield 
=> $oldbiblionumtagsubfield);
  }
! print "Content-Type: text/html\n\n", $template->output;
--- 294,296 ----
                                                        oldbiblionumtagsubfield 
=> $oldbiblionumtagsubfield);
  }
! print $input->header(-cookie => $cookie),$template->output;

Index: addbooks.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbooks.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** addbooks.pl 10 Dec 2002 13:29:09 -0000      1.15
--- addbooks.pl 12 Dec 2002 16:34:41 -0000      1.16
***************
*** 34,39 ****
  # Suite 330, Boston, MA  02111-1307 USA
  
- use CGI;
  use strict;
  use C4::Auth;
  use C4::Catalogue;
--- 34,39 ----
  # Suite 330, Boston, MA  02111-1307 USA
  
  use strict;
+ use CGI;
  use C4::Auth;
  use C4::Catalogue;
***************
*** 43,52 ****
  
  my $query = new CGI;
- my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
  
  my $error   = $query->param('error');
  my $success = $query->param('biblioitem');
! my $template= gettemplate("acqui.simple/addbooks.tmpl");
! $template->param(loggedinuser => $loggedinuser);
! 
  print $query->header(-cookie => $cookie),$template->output;
--- 43,56 ----
  
  my $query = new CGI;
  
  my $error   = $query->param('error');
  my $success = $query->param('biblioitem');
! my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "acqui.simple/addbooks.tmpl",
!                            query => $query,
!                            type => "intranet",
!                            authnotrequired => 0,
!                            flagsrequired => {catalogue => 1},
!                            debug => 1,
!                            });
  print $query->header(-cookie => $cookie),$template->output;

Index: additem.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/additem.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** additem.pl  10 Dec 2002 13:29:09 -0000      1.9
--- additem.pl  12 Dec 2002 16:34:41 -0000      1.10
***************
*** 22,25 ****
--- 22,26 ----
  use CGI;
  use strict;
+ use C4::Auth;
  use C4::Output;
  use C4::Biblio;
***************
*** 70,73 ****
--- 71,75 ----
        }
        my $record = 
MARChtml2marc($dbh,address@hidden,address@hidden,address@hidden,%indicators);
+       warn "item before NEWnewitem : ".$record->as_formatted();
  # MARC::Record builded => now, record in DB
        my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = 
NEWnewitem($dbh,$record,$bibid);
***************
*** 97,100 ****
--- 99,103 ----
  # MARC::Record builded => now, record in DB
        my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = 
NEWmoditem($dbh,$record,$bibid,$itemnum,0);
+       $itemnum="";
        $nextop="additem";
  }
***************
*** 228,232 ****
        }
  }
! my $template = gettemplate("acqui.simple/additem.tmpl");
  # what's the next op ? it's what we are not in : an add if we're editing, 
otherwise, and edit.
  $template->param(item_loop => address@hidden,
--- 231,243 ----
        }
  }
! my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "acqui.simple/additem.tmpl",
!                            query => $input,
!                            type => "intranet",
!                            authnotrequired => 0,
!                            flagsrequired => {parameters => 1},
!                            debug => 1,
!                            });
! 
  # what's the next op ? it's what we are not in : an add if we're editing, 
otherwise, and edit.
  $template->param(item_loop => address@hidden,
***************
*** 239,241 ****
                                                op => $nextop,
                                                opisadd => ($nextop eq 
"saveitem")?0:1);
! print "Content-Type: text/html\n\n", $template->output;
--- 250,252 ----
                                                op => $nextop,
                                                opisadd => ($nextop eq 
"saveitem")?0:1);
! print $input->header(-cookie => $cookie),$template->output;

Index: isbnsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/isbnsearch.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** isbnsearch.pl       22 Oct 2002 15:50:23 -0000      1.5
--- isbnsearch.pl       12 Dec 2002 16:34:42 -0000      1.6
***************
*** 19,24 ****
  # Suite 330, Boston, MA  02111-1307 USA
  
- use CGI;
  use strict;
  use C4::Catalogue;
  use C4::Biblio;
--- 19,25 ----
  # Suite 330, Boston, MA  02111-1307 USA
  
  use strict;
+ use CGI;
+ use C4::Auth;
  use C4::Catalogue;
  use C4::Biblio;
***************
*** 35,39 ****
  my $count;
  my @results;
! my $template = gettemplate("acqui.simple/isbnsearch.tmpl");
  if (! $isbn) {
        print $input->redirect('addbooks.pl');
--- 36,47 ----
  my $count;
  my @results;
! my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "acqui.simple/isbnsearch.tmpl",
!                            query => $input,
!                            type => "intranet",
!                            authnotrequired => 0,
!                            flagsrequired => {catalogue => 1},
!                            debug => 1,
!                            });
  if (! $isbn) {
        print $input->redirect('addbooks.pl');
***************
*** 83,86 ****
                                                        loop_links => 
address@hidden);
  
!       print "Content-Type: text/html\n\n", $template->output;
  } # else
--- 91,94 ----
                                                        loop_links => 
address@hidden);
  
!       print $input->header(-cookie => $cookie),$template->output;
  } # else