[Koha-cvs] koha/C4 Barcodes/PrinterConfig.pm Biblio.pm [rel_TG]

[Tumer Garip]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_TG
Changes by:	Tumer Garip <tgarip1957>	07/04/03 18:23:14

Modified files:
	C4/Barcodes    : PrinterConfig.pm 
	C4             : Biblio.pm 

Log message:
	Bug fixing on barcode printing

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Barcodes/PrinterConfig.pm?cvsroot=koha&only_with_tag=rel_TG&r1=1.4.2.1&r2=1.4.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&only_with_tag=rel_TG&r1=1.187.2.2&r2=1.187.2.3

Patches:
Index: Barcodes/PrinterConfig.pm
===================================================================
RCS file: /sources/koha/koha/C4/Barcodes/PrinterConfig.pm,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- Barcodes/PrinterConfig.pm	26 Mar 2007 02:19:20 -0000	1.4.2.1
+++ Barcodes/PrinterConfig.pm	3 Apr 2007 18:23:13 -0000	1.4.2.2
@@ -149,7 +149,7 @@
 	# Calculates the next label position and return that label number
 	my $nextIndexX = $labelNum % @positionsForX;
 	my $nextIndexY = $labelNum % @positionsForY;
-	if ($labelNum== 0) {
+	if (!$gfxObject) {
           $page = $pdf->page;
           $page->mediabox($pageType);
           $gfxObject = $page->gfx;

Index: Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.187.2.2
retrieving revision 1.187.2.3
diff -u -b -r1.187.2.2 -r1.187.2.3
--- Biblio.pm	25 Mar 2007 23:46:14 -0000	1.187.2.2
+++ Biblio.pm	3 Apr 2007 18:23:14 -0000	1.187.2.3
@@ -960,9 +960,9 @@
 
 # add the item to zebra it will add the biblio as well!!!
     ZEBRAop( $dbh, $biblionumber,"specialUpdate","biblioserver" );
-return $itemnumber;
-}## added new item
 
+}## added new item
+return $itemnumber;
 }
 
 
@@ -1219,10 +1219,18 @@
 	if ($server eq "biblioserver"){
 	($marcxml) =ZEBRA_readyXML($dbh,$biblionumber);
 	}elsif($server eq "authorityserver"){
-	$marcxml =C4::AuthoritiesMarc::XMLgetauthority($dbh,$biblionumber);
+	$marcxml =C4::AuthoritiesMarc::ZEBRA_readyauthority($dbh,$biblionumber);
 	} 
 ZEBRAopserver($marcxml,$op,$server,$biblionumber);
 ZEBRAopcommit($server);
+## If a delete operation delete the SQL DB as well
+	if ($op eq "recordDelete"  ){
+		if ($server eq "biblioserver"){
+		ZEBRAdelbiblio($dbh,$biblionumber);
+		}elsif ($server eq "authorityserver"){
+		ZEBRAdelauthority($dbh,$biblionumber);
+		}
+	}
 }else{
 my $sth=$dbh->prepare("insert into zebraqueue  (biblio_auth_number ,server,operation) values(?,?,?)");
 $sth->execute($biblionumber,$server,$op);