[Koha-cvs] koha cataloguing/addbooks.pl koha-tmpl/intranet... [rel_3_0]

[Antoine Farnault]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	06/11/03 09:44:25

Modified files:
	cataloguing    : addbooks.pl 
	koha-tmpl/intranet-tmpl/prog/en/cataloguing: addbooks.tmpl 

Log message:
	display the search errors if any.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbooks.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3

Patches:
Index: cataloguing/addbooks.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/addbooks.pl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- cataloguing/addbooks.pl	3 Nov 2006 08:47:12 -0000	1.2.2.1
+++ cataloguing/addbooks.pl	3 Nov 2006 09:44:25 -0000	1.2.2.2
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: addbooks.pl,v 1.2.2.1 2006/11/03 08:47:12 toins Exp $
+# $Id: addbooks.pl,v 1.2.2.2 2006/11/03 09:44:25 toins Exp $
 
 #
 # Modified saas at users.sf.net 12:00 01 April 2001
@@ -44,7 +44,6 @@
 
 my $input = new CGI;
 
-my $error   = $input->param('error');
 my $success = $input->param('biblioitem');
 my $query   = $input->param('q');
 
@@ -59,20 +58,31 @@
     }
 );
 
+# get framework list
+my $frameworks = getframeworks;
+my @frameworkcodeloop;
+foreach my $thisframeworkcode (keys %$frameworks) {
+	my %row =(value => $thisframeworkcode,
+				frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
+			);
+	push @frameworkcodeloop, \%row;
+}
+
 # Searching the catalog.
-my ($error, $marcresults) = SimpleSearch($query);
+if($query) {
+    my ($error, $marcresults) = SimpleSearch($query);
 
-if (defined $error) {
-    $template->param(query_error => $error);
+    if (defined $error) {
+        $template->param(error => $error);
     warn "error: ".$error;
     output_html_with_http_headers $input, $cookie, $template->output;
     exit;
-}
+    }
 
-my $total = scalar @$marcresults;
-my @results;
+    my $total = scalar @$marcresults;
+    my @results;
 
-for(my $i=0;$i<$total;$i++) {
+    for(my $i=0;$i<$total;$i++) {
     my %resultsloop;
     my $marcrecord = MARC::File::USMARC::decode($marcresults->[$i]);
     my $biblio = MARCmarc2koha(C4::Context->dbh,$marcrecord,'');
@@ -95,25 +105,17 @@
     $resultsloop{publicationyear} = $biblio->{'publicationyear'};
 
     push @results, \%resultsloop;
-}
-
-
-# get framework list
-my $frameworks = getframeworks;
-my @frameworkcodeloop;
-foreach my $thisframeworkcode (keys %$frameworks) {
-	my %row =(value => $thisframeworkcode,
-				frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
+    }
+    $template->param(
+        total => $total,
+        query => $query,
+        resultsloop => \@results,
 			);
-	push @frameworkcodeloop, \%row;
 }
 
 my $marc_p = C4::Context->boolean_preference("marc");
 $template->param( NOTMARC => !$marc_p,
 				  frameworkcodeloop => \@frameworkcodeloop,
-				  total => $total,
-				  query => $query,
-				  resultsloop => \@results,
 				   );
 
 output_html_with_http_headers $input, $cookie, $template->output;

Index: koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl	3 Nov 2006 08:47:12 -0000	1.1.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl	3 Nov 2006 09:44:25 -0000	1.1.2.3
@@ -22,7 +22,7 @@
 			<input type="submit" value="Add Record Without Search" />
 		</form>
 	<!-- TMPL_ELSE -->
-		<form action="addbiblio.pl" method="post">
+		<form name="f" action="addbiblio.pl" method="post">
 		<h2>Create a Blank Bibliographic Record</h2>
 		<p>
 			<label for="frameworkcode">Choose a Framework:</label>
@@ -75,6 +75,10 @@
     <!-- /TMPL_LOOP -->
     </table>
 </div>
+<!-- TMPL_ELSE -->
+    <b>No Result found.</b>
+    <!-- TMPL_IF NAME="error" -->
+        Error: <span class="error"><!-- TMPL_VAR NAME="error" --></span>
+    <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
-
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->