[Koha-cvs] koha/cataloguing addbiblio.pl addbooks.pl addit...

[Tumer Garip]

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     Tumer Garip <tgarip1957>        06/09/11 17:12:04

Modified files:
        cataloguing    : addbiblio.pl addbooks.pl additem.pl 

Log message:
        Fixes a bug with Marchtml2xml and sync with dev_week

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbiblio.pl?cvsroot=koha&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbooks.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/additem.pl?cvsroot=koha&r1=1.9&r2=1.10

Patches:
Index: addbiblio.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/addbiblio.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- addbiblio.pl        6 Sep 2006 16:21:04 -0000       1.16
+++ addbiblio.pl        11 Sep 2006 17:12:04 -0000      1.17
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: addbiblio.pl,v 1.16 2006/09/06 16:21:04 tgarip1957 Exp $
+# $Id: addbiblio.pl,v 1.17 2006/09/11 17:12:04 tgarip1957 Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -42,6 +42,7 @@
 my $logstatus=C4::Context->preference('Activate_log');
 my $xml;
 my $itemtype; # created here because it can be used in 
build_authorized_values_list sub
+my $fromserials=$input->param('fromserials');## if a serial is being added do 
not display navigation menus
 
 ###Find related tags for Z3950 searches- required  by template
 my($isbntag,$isbnsub)=MARCfind_marc_from_kohafield("isbn","biblios");
@@ -598,14 +599,14 @@
        # build indicator hash.
        my @ind_tag = $input->param('ind_tag');
        my @indicator = $input->param('indicator');
-       
+       my @tagindex=$input->param('tagindex');
        
        
 ## check for malformed xml -- non UTF-8 like (MARC8) will break xml without 
warning
 ### This usually happens with data coming from other Z3950 servers
 ## Slows the saving process so comment out at your own risk
 eval{
- $xml = 
MARChtml2xml(address@hidden,address@hidden,address@hidden,address@hidden,address@hidden);
      
+ $xml = 
MARChtml2xml(address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden);
       
 };
  if ($@){
 warn $@;
@@ -629,14 +630,21 @@
 
                }
        # now, redirect to additem page
-               print 
$input->redirect("additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode");
+               unless ($fromserials){
+               print 
$input->redirect("additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode")
 unless $fromserials;
                exit;
+               }else{
+               my $title=XML_readline_onerecord($xmlhash,"title","biblios");
+               
$template->param(exit=>1,biblionumber=>$biblionumber,title=>$title);
+               goto FINAL;
+               }
+
        } else {
 FINAL:
        # it may be a duplicate, warn the user and do nothing
                build_tabs ($template, $xmlhash, $dbh);
                build_hidden_data;
-               $template->param(
+               $template->param(fromserials=>$fromserials,
                        oldbiblionumber             => $oldbiblionumber,
                        biblionumber                      => $biblionumber,
                        oldbiblionumtagfield        => $oldbiblionumtagfield,
@@ -655,7 +663,8 @@
        # build indicator hash.
        my @ind_tag = $input->param('ind_tag');
        my @indicator = $input->param('indicator');
-       my $xml = 
MARChtml2xml(address@hidden,address@hidden,address@hidden,address@hidden,address@hidden);
+       my @tagindex=$input->param('tagindex');
+       my $xml = 
MARChtml2xml(address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden);
        my $xmlhash=XML_xml2hash_onerecord($xml);
        # adding an empty field
        build_tabs ($template, $xmlhash, $dbh,$addedfield);
@@ -665,6 +674,7 @@
                biblionumber                     => $biblionumber,
                oldbiblionumtagfield        => $oldbiblionumtagfield,
                oldbiblionumtagsubfield     => $oldbiblionumtagsubfield,
+               fromserials=>$fromserials
                 );
 } elsif ($op eq "delete") {
 
#------------------------------------------------------------------------------------------------------------------------------
@@ -679,8 +689,6 @@
        }else{
 
 $template->param(error            => 1, onloan=>1,);
-
-goto OUT;
        }
 
#------------------------------------------------------------------------------------------------------------------------------
 
#------------------------------------------------------------------------------------------------------------------------------
@@ -701,7 +709,8 @@
                oldbiblionumber             => $oldbiblionumber,
                biblionumber                       => $biblionumber,
                oldbiblionumtagfield        => $oldbiblionumtagfield,
-               oldbiblionumtagsubfield     => $oldbiblionumtagsubfield         
        
+               oldbiblionumtagsubfield     => $oldbiblionumtagsubfield,
+               fromserials=>$fromserials                       
                );
 }
 $template->param(

Index: addbooks.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/addbooks.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- addbooks.pl 6 Sep 2006 16:21:04 -0000       1.4
+++ addbooks.pl 11 Sep 2006 17:12:04 -0000      1.5
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: addbooks.pl,v 1.4 2006/09/06 16:21:04 tgarip1957 Exp $
+# $Id: addbooks.pl,v 1.5 2006/09/11 17:12:04 tgarip1957 Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #

Index: additem.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/additem.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- additem.pl  6 Sep 2006 16:21:04 -0000       1.9
+++ additem.pl  11 Sep 2006 17:12:04 -0000      1.10
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: additem.pl,v 1.9 2006/09/06 16:21:04 tgarip1957 Exp $
+# $Id: additem.pl,v 1.10 2006/09/11 17:12:04 tgarip1957 Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #