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

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     Antoine Farnault <toins>        07/07/12 15:28:00

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

Log message:
        adding a pagination bar & displaying only 20 results per page.
        style enhancement
        re indenting

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbooks.pl?cvsroot=koha&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl?cvsroot=koha&r1=1.8&r2=1.9

Patches:
Index: cataloguing/addbooks.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/addbooks.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- cataloguing/addbooks.pl     6 Jun 2007 13:08:35 -0000       1.12
+++ cataloguing/addbooks.pl     12 Jul 2007 15:28:00 -0000      1.13
@@ -1,19 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: addbooks.pl,v 1.12 2007/06/06 13:08:35 tipaul Exp $
-
-#
-# Modified address@hidden 12:00 01 April 2001
-# The biblioitemnumber was not correctly initialised
-# The max(barcode) value was broken - koha 'barcode' is a string value!
-# - If left blank, barcode value now defaults to max(biblionumber)
-
-#
-# TODO
-#
-# Add info on biblioitems and items already entered as you enter new ones
-#
-# Add info on biblioitems and items already entered as you enter new ones
+# $Id: addbooks.pl,v 1.13 2007/07/12 15:28:00 toins Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -32,13 +19,18 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
+=head1 cataloguing:addbooks.pl
+
+       TODO
+
+=cut
+
 use strict;
 use CGI;
 use C4::Auth;
 use C4::Biblio;
 use C4::Breeding;
 use C4::Output;
-
 use C4::Koha;
 use C4::Search;
 
@@ -47,6 +39,9 @@
 my $success = $input->param('biblioitem');
 my $query   = $input->param('q');
 my @value = $input->param('value');
+my $page    = $input->param('page') || 1;
+my $results_per_page = 20;
+
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -62,46 +57,56 @@
 # get framework list
 my $frameworks = getframeworks;
 my @frameworkcodeloop;
-foreach my $thisframeworkcode (keys %$frameworks) {
-       my %row =(value => $thisframeworkcode,
+foreach my $thisframeworkcode ( keys %$frameworks ) {
+    my %row = (
+        value         => $thisframeworkcode,
                                frameworktext => 
$frameworks->{$thisframeworkcode}->{'frameworktext'},
                        );
        push @frameworkcodeloop, \%row;
 }
 
 # Searching the catalog.
-if($query) {
+if ($query) {
+
     # find results
-    my ($error, $marcresults) = SimpleSearch($query);
+    my ( $error, $marcresults ) = SimpleSearch($query);
 
-    if (defined $error) {
-        $template->param(error => $error);
-        warn "error: ".$error;
+    if ( defined $error ) {
+        $template->param( error => $error );
+        warn "error: " . $error;
         output_html_with_http_headers $input, $cookie, $template->output;
         exit;
     }
+
     # format output
     my $total = scalar @$marcresults;
-    my @newresults = searchResults($query, $total, $total , 0, @$marcresults);
+    my @newresults = searchResults( $query, $total, $results_per_page, $page, 
@$marcresults );
+    
     $template->param(
         total => $total,
         query => $query,
         resultsloop => address@hidden,
+        pagination_bar => pagination_bar(
+                               
"/cgi-bin/koha/cataloguing/addbooks.pl?q=$query&",
+                                getnbpages( $total, $results_per_page ),
+               $page,
+                       'page'
+               ),
     );
 }
 
 # fill with books in breeding farm
-my $toggle=0;
-my ($title,$isbn);
+my $toggle = 0;
+my ( $title, $isbn );
+
 # fill isbn or title, depending on what has been entered
 #u must do check on isbn because u can find number in beginning of title
 #check is on isbn legnth 13 for new isbn and 10 for old isbn
-my $querylength=length($query);
- if ($query =~ /\d/ and ($querylength eq 13 or $querylength eq 10))
-{
-$isbn=$query;
+my $querylength = length($query);
+if ( $query =~ /\d/ and ( $querylength eq 13 or $querylength eq 10 ) ) {
+    $isbn = $query;
 }
-$title=$query unless $isbn;
+$title = $query unless $isbn;
 my ( $countbr, @resultsbr ) = BreedingSearch( $title, $isbn ) if $query;
 my @breeding_loop = ();
 for ( my $i = 0 ; $i <= $#resultsbr ; $i++ ) {
@@ -118,11 +123,12 @@
     $row_data{file}   = $resultsbr[$i]->{'file'};
     $row_data{title}  = $resultsbr[$i]->{'title'};
     $row_data{author} = $resultsbr[$i]->{'author'};
-    push ( @breeding_loop, \%row_data );
+    push( @breeding_loop, \%row_data );
 }
 
-$template->param( frameworkcodeloop => address@hidden,
+$template->param(
+    frameworkcodeloop => address@hidden,
                   breeding_loop => address@hidden,
-              );
+);
 
 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl   10 Jul 2007 
15:17:02 -0000      1.8
+++ koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl   12 Jul 2007 
15:28:00 -0000      1.9
@@ -10,12 +10,14 @@
                No items found
        <!-- /TMPL_IF -->
        
-<h2>Search Existing Records</h2>
+<h3>Search Existing Records</h3>
 <div id="addbooks_search">
        <form name="search" action="addbooks.pl">
+               <p>
         <label for="q">Search the catalog: </label>
         <input id="q" type="text"  size="25"   name="q" />
         <input type="submit" value="search">
+        </p>
        </form>
 </div>
 <div id="addbooks_add_without_search">
@@ -24,8 +26,9 @@
                        <input type="submit" value="Add Record Without Search" 
/>
                </form>
        <!-- TMPL_ELSE -->
+               <br />
                <form name="f" action="addbiblio.pl" method="post">
-               <h2>Create a Blank Bibliographic Record</h2>
+               <h3>Create a Blank Bibliographic Record</h3>
                <p>
                        <label for="frameworkcode">Choose a Framework:</label>
                        <select name="frameworkcode" id="frameworkcode">
@@ -46,7 +49,9 @@
 <!-- display the search results -->
 
 <!-- TMPL_IF NAME="total"-->
+<br />
 <!-- TMPL_VAR NAME="total"--> Results found in catalogue.
+<!-- TMPL_VAR name='pagination_bar'-->
 <div class="searchresults">
     <table>
         <tr>
@@ -115,14 +120,17 @@
     </table>
 </div>
 <!-- TMPL_ELSE -->
+    <!-- TMPL_IF name='query'-->
     <b>No Result found in catalogue.</b>
     <!-- TMPL_IF NAME="error" -->
         Error: <span class="error"><!-- TMPL_VAR NAME="error" --></span>
     <!-- /TMPL_IF -->
+    <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 
+<!-- TMPL_IF name='query'-->
 <div id="searchresult-breeding">
-    <h2>Biblios in reservoir</h2>
+    <h3>Biblios in reservoir</h3>
     <!-- TMPL_IF name="breeding_loop" -->
         <table>
             <tr>
@@ -141,7 +149,7 @@
                 <!-- TMPL_IF NAME="NOTMARC" -->
                                     
                 <!-- TMPL_ELSE -->
-                <td><a href="addbiblio.pl?breedingid=<!-- TMPL_VAR NAME="id" 
-->">Add biblio</a></td>
+                <td><a 
href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=<!-- TMPL_VAR NAME="id" 
-->">Add biblio</a></td>
                 <!-- /TMPL_IF -->
             </tr>
             <!-- /TMPL_LOOP -->
@@ -150,6 +158,8 @@
     <p>None</p>
     <!-- /TMPL_IF -->
 </div>
+<!-- /TMPL_IF -->
+
 <script type="text/JavaScript">
     document.search.q.focus();
 </script>