[Koha-cvs] koha/z3950 search.pl [dev_week]

[Ryan Higgins]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Ryan Higgins <rych>	07/01/02 16:40:34

Modified files:
	z3950          : search.pl 

Log message:
	add error msg for import failure

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/z3950/search.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.6.2.3&r2=1.3.2.6.2.4

Patches:
Index: search.pl
===================================================================
RCS file: /sources/koha/koha/z3950/search.pl,v
retrieving revision 1.3.2.6.2.3
retrieving revision 1.3.2.6.2.4
diff -u -b -r1.3.2.6.2.3 -r1.3.2.6.2.4
--- search.pl	3 Nov 2006 02:59:05 -0000	1.3.2.6.2.3
+++ search.pl	2 Jan 2007 16:40:34 -0000	1.3.2.6.2.4
@@ -164,6 +164,7 @@
 		my $i;
 		my $result='';
 		@breeding_loop = ();
+#FIXME this should be a preference (numresults)
 		if ($numresults>0){
 			for ($i=0; $i<(($numresults<5) ? ($numresults) : (5)) ; $i++) {
 				my $rec=$oResult[$k]->record($i); 										
@@ -178,6 +179,10 @@
 				$oldbiblio->{isbn} =~ s/ |-|\.//g,
 				$oldbiblio->{issn} =~ s/ |-|\.//g,
 				my ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported,$bid)=ImportBreeding($marcdata,1,$serverhost[$k],$encoding[$k],$random);
+				my $warnings;
+				$warnings = "Invalid MARC record" if ($notmarcrecord);
+				$warnings .= "\nThis record already exists in catalog" if ($alreadyindb);
+				$warnings .= "\nThis record already exists in reservoir" if ($alreadyinfarm);
 			
 				my %row_data;
 				if ($i % 2) {
@@ -192,6 +197,7 @@
 				$row_data{author} = $oldbiblio->{author};
 				$row_data{id} = $bid;
 				$row_data{oldbiblionumber}=$oldbiblionumber;
+				$row_data{warning}=$warnings;
 				push (@breeding_loop, \%row_data);
          
 			}# upto 5 results