[Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.60,1.61

[Paul POULAIN]

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

Modified Files:
        addbiblio.pl 
Log Message:
continuing the road to zebra :
- the biblio add begins to work.
- the biblio modif begins to work.

(still without doing anything on zebra)
(no new change in updatedatabase)

Index: addbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -r1.60 -r1.61
*** addbiblio.pl        9 Aug 2005 14:10:27 -0000       1.60
--- addbiblio.pl        10 Aug 2005 10:21:14 -0000      1.61
***************
*** 397,411 ****
  
  $is_a_modif=0;
! my ($oldbiblionumtagfield,$oldbiblionumtagsubfield);
! my 
($oldbiblioitemnumtagfield,$oldbiblioitemnumtagsubfield,$bibitem,$oldbiblioitemnumber);
  if ($biblionumber) {
        $is_a_modif=1;
!       # if it's a modif, retrieve old biblio and bibitem numbers for the 
future modification of old-DB.
!       ($oldbiblionumtagfield,$oldbiblionumtagsubfield) = 
&MARCfind_marc_from_kohafield($dbh,"biblio.biblionumber",$frameworkcode);
!       ($oldbiblioitemnumtagfield,$oldbiblioitemnumtagsubfield) = 
&MARCfind_marc_from_kohafield($dbh,"biblioitems.biblioitemnumber",$frameworkcode);
        # search biblioitems value
        my $sth=$dbh->prepare("select biblioitemnumber from biblioitems where 
biblionumber=?");
        $sth->execute($biblionumber);
!       ($oldbiblioitemnumber) = $sth->fetchrow;
  }
  
#------------------------------------------------------------------------------------------------------------------------------
--- 397,411 ----
  
  $is_a_modif=0;
! my ($biblionumtagfield,$biblionumtagsubfield);
! my 
($biblioitemnumtagfield,$biblioitemnumtagsubfield,$bibitem,$biblioitemnumber);
  if ($biblionumber) {
        $is_a_modif=1;
!       # if it's a modif, retrieve bibli and biblioitem numbers for the future 
modification of old-DB.
!       ($biblionumtagfield,$biblionumtagsubfield) = 
&MARCfind_marc_from_kohafield($dbh,"biblio.biblionumber",$frameworkcode);
!       ($biblioitemnumtagfield,$biblioitemnumtagsubfield) = 
&MARCfind_marc_from_kohafield($dbh,"biblioitems.biblioitemnumber",$frameworkcode);
        # search biblioitems value
        my $sth=$dbh->prepare("select biblioitemnumber from biblioitems where 
biblionumber=?");
        $sth->execute($biblionumber);
!       ($biblioitemnumber) = $sth->fetchrow;
  }
  
#------------------------------------------------------------------------------------------------------------------------------
***************
*** 430,435 ****
        if (!$duplicatebiblionumber or $confirm_not_duplicate) {
                # MARC::Record built => now, record in DB
-               my $oldbibnum;
-               my $oldbibitemnum;
                if ($is_a_modif) {
                        
NEWmodbiblioframework($dbh,$biblionumber,$frameworkcode);
--- 430,433 ----
***************
*** 437,442 ****
                        
logaction($loggedinuser,"acqui.simple","modify",$biblionumber,"record : 
".$record->as_formatted) if (C4::Context->preference("Activate_Log"));
                } else {
!                       ($biblionumber,$oldbibnum,$oldbibitemnum) = 
NEWnewbiblio($dbh,$record,$frameworkcode);
!                       
logaction($loggedinuser,"acqui.simple","add",$oldbibnum,"record : 
".$record->as_formatted) if (C4::Context->preference("Activate_Log"));
                }
        # now, redirect to additem page
--- 435,441 ----
                        
logaction($loggedinuser,"acqui.simple","modify",$biblionumber,"record : 
".$record->as_formatted) if (C4::Context->preference("Activate_Log"));
                } else {
!                       my $biblioitemnumber;
!                       ($biblionumber,$biblioitemnumber) = 
NEWnewbiblio($dbh,$record,$frameworkcode);
!                       
logaction($loggedinuser,"acqui.simple","add",$biblionumber,"record : 
".$record->as_formatted) if (C4::Context->preference("Activate_Log"));
                }
        # now, redirect to additem page
***************
*** 449,457 ****
                $template->param(
                        biblionumber             => $biblionumber,
!                       oldbiblionumtagfield        => $oldbiblionumtagfield,
!                       oldbiblionumtagsubfield     => $oldbiblionumtagsubfield,
!                       oldbiblioitemnumtagfield    => 
$oldbiblioitemnumtagfield,
!                       oldbiblioitemnumtagsubfield => 
$oldbiblioitemnumtagsubfield,
!                       oldbiblioitemnumber         => $oldbiblioitemnumber,
                        duplicatebiblionumber           => 
$duplicatebiblionumber,
                        duplicatetitle                          => 
$duplicatetitle,
--- 448,456 ----
                $template->param(
                        biblionumber             => $biblionumber,
!                       biblionumtagfield        => $biblionumtagfield,
!                       biblionumtagsubfield     => $biblionumtagsubfield,
!                       biblioitemnumtagfield    => $biblioitemnumtagfield,
!                       biblioitemnumtagsubfield => $biblioitemnumtagsubfield,
!                       biblioitemnumber         => $biblioitemnumber,
                        duplicatebiblionumber           => 
$duplicatebiblionumber,
                        duplicatetitle                          => 
$duplicatetitle,
***************
*** 480,488 ****
        $template->param(
                biblionumber             => $biblionumber,
!               oldbiblionumtagfield        => $oldbiblionumtagfield,
!               oldbiblionumtagsubfield     => $oldbiblionumtagsubfield,
!               oldbiblioitemnumtagfield    => $oldbiblioitemnumtagfield,
!               oldbiblioitemnumtagsubfield => $oldbiblioitemnumtagsubfield,
!               oldbiblioitemnumber         => $oldbiblioitemnumber );
  } elsif ($op eq "delete") {
  
#------------------------------------------------------------------------------------------------------------------------------
--- 479,487 ----
        $template->param(
                biblionumber             => $biblionumber,
!               biblionumtagfield        => $biblionumtagfield,
!               biblionumtagsubfield     => $biblionumtagsubfield,
!               biblioitemnumtagfield    => $biblioitemnumtagfield,
!               biblioitemnumtagsubfield => $biblioitemnumtagsubfield,
!               biblioitemnumber         => $biblioitemnumber );
  } elsif ($op eq "delete") {
  
#------------------------------------------------------------------------------------------------------------------------------
***************
*** 492,496 ****
        print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; 
URL=/cgi-bin/koha/search.marc/search.pl?type=intranet\"></html>";
        exit;
! 
#------------------------------------------------------------------------------------------------------------------------------logaction($loggedinuser,"acqui.simple","add","biblionumber
 :$oldbibnum");
  
#------------------------------------------------------------------------------------------------------------------------------
  } else {
--- 491,495 ----
        print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; 
URL=/cgi-bin/koha/search.marc/search.pl?type=intranet\"></html>";
        exit;
! 
#------------------------------------------------------------------------------------------------------------------------------
  
#------------------------------------------------------------------------------------------------------------------------------
  } else {
***************
*** 507,515 ****
        $template->param(
                biblionumber             => $biblionumber,
!               oldbiblionumtagfield        => $oldbiblionumtagfield,
!               oldbiblionumtagsubfield     => $oldbiblionumtagsubfield,
!               oldbiblioitemnumtagfield    => $oldbiblioitemnumtagfield,
!               oldbiblioitemnumtagsubfield => $oldbiblioitemnumtagsubfield,
!               oldbiblioitemnumber         => $oldbiblioitemnumber,
                );
  }
--- 506,514 ----
        $template->param(
                biblionumber             => $biblionumber,
!               biblionumtagfield        => $biblionumtagfield,
!               biblionumtagsubfield     => $biblionumtagsubfield,
!               biblioitemnumtagfield    => $biblioitemnumtagfield,
!               biblioitemnumtagsubfield => $biblioitemnumtagsubfield,
!               biblioitemnumber         => $biblioitemnumber,
                );
  }