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

[paul poulain]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     paul poulain <tipaul>   07/01/04 14:49:16

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

Log message:
        reintroducing reservoir management in cataloguing

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbooks.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.3&r2=1.2.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.14&r2=1.1.2.15
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.4&r2=1.1.2.5

Patches:
Index: cataloguing/addbooks.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/addbooks.pl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- cataloguing/addbooks.pl     18 Dec 2006 16:35:18 -0000      1.2.2.3
+++ cataloguing/addbooks.pl     4 Jan 2007 14:49:16 -0000       1.2.2.4
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: addbooks.pl,v 1.2.2.3 2006/12/18 16:35:18 toins Exp $
+# $Id: addbooks.pl,v 1.2.2.4 2007/01/04 14:49:16 tipaul Exp $
 
 #
 # Modified address@hidden 12:00 01 April 2001
@@ -36,6 +36,7 @@
 use CGI;
 use C4::Auth;
 use C4::Biblio;
+use C4::Breeding;
 use C4::Output;
 use C4::Interface::CGI::Output;
 
@@ -46,6 +47,7 @@
 
 my $success = $input->param('biblioitem');
 my $query   = $input->param('q');
+my @value = $input->param('value');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -70,7 +72,7 @@
 
 # Searching the catalog.
 if($query) {
-    my ($error, $marcresults) = SimpleSearch($query);
+    my ($error, $marcresults);# = SimpleSearch($query);
 
     if (defined $error) {
         $template->param(error => $error);
@@ -79,7 +81,7 @@
         exit;
     }
 
-    my $total = scalar @$marcresults;
+    my $total;# = scalar @$marcresults;
     my @results;
 
     for(my $i=0;$i<$total;$i++) {
@@ -113,9 +115,33 @@
     );
 }
 
-my $marc_p = C4::Context->boolean_preference("marc");
-$template->param( NOTMARC => !$marc_p,
-                                 frameworkcodeloop => address@hidden,
+# fill with books in breeding farm
+my $toggle=0;
+my ($title,$isbn);
+# fill isbn or title, depending on what has been entered
+$isbn=$query if $query =~ /\d/;
+$title=$query unless $isbn;
+my ( $countbr, @resultsbr ) = BreedingSearch( $title, $isbn ) if $query;
+my @breeding_loop = ();
+for ( my $i = 0 ; $i <= $#resultsbr ; $i++ ) {
+    my %row_data;
+    if ( $i % 2 ) {
+        $toggle = 0;
+    }
+    else {
+        $toggle = 1;
+    }
+    $row_data{toggle} = $toggle;
+    $row_data{id}     = $resultsbr[$i]->{'id'};
+    $row_data{isbn}   = $resultsbr[$i]->{'isbn'};
+    $row_data{file}   = $resultsbr[$i]->{'file'};
+    $row_data{title}  = $resultsbr[$i]->{'title'};
+    $row_data{author} = $resultsbr[$i]->{'author'};
+    push ( @breeding_loop, \%row_data );
+}
+
+$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/addbiblio.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -b -r1.1.2.14 -r1.1.2.15
--- koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl  27 Nov 2006 
17:25:44 -0000      1.1.2.14
+++ koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl  4 Jan 2007 
14:49:16 -0000       1.1.2.15
@@ -295,7 +295,7 @@
                }
        }
        if(error < 4){
-       newin=window.open("../z3950/search.pl?biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" 
-->"+strQuery,"z3950search",'width=640,height=400,location=yes,toolbar=no,scrollbars=yes');
+       newin=window.open("z3950_search.pl?biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" 
-->"+strQuery,"z3950search",'width=640,height=400,location=yes,toolbar=no,scrollbars=yes');
        } else {
                alert("To perform a z39.50 search, you must enter at least one 
of the following: \n\n ISBN\n ISSN\n Title\n Author\n");
        }

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.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl   27 Nov 2006 
17:23:14 -0000      1.1.2.4
+++ koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl   4 Jan 2007 
14:49:16 -0000       1.1.2.5
@@ -44,7 +44,7 @@
 <!-- display the search results -->
 
 <!-- TMPL_IF NAME="total"-->
-<!-- TMPL_VAR NAME="total"--> Results found.
+<!-- TMPL_VAR NAME="total"--> Results found in catalogue.
 <div class="searchresults">
     <table>
     <tr>
@@ -76,12 +76,42 @@
     </table>
 </div>
 <!-- TMPL_ELSE -->
-    <b>No Result found.</b>
+    <b>No Result found in catalogue.</b>
     <!-- TMPL_IF NAME="error" -->
         Error: <span class="error"><!-- TMPL_VAR NAME="error" --></span>
     <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 
+<div id="searchresult-breeding">
+    <h2>Biblios in reservoir</h2>
+    <!-- TMPL_IF name="breeding_loop" -->
+        <table>
+            <tr>
+                <th>Title</th>
+                <th>Author</th>
+                <th>ISBN</th>
+                <th>coming from</th>
+                <th>&nbsp;</th>
+                <th>&nbsp;</th>
+            </tr>
+            <!-- TMPL_LOOP NAME="breeding_loop" -->
+            <!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr 
class="hilighted"><!-- /TMPL_IF -->
+                <td><!-- TMPL_VAR NAME="title" --></a>
+                <td><!-- TMPL_VAR NAME="author" --></td>
+                <td><!-- TMPL_VAR NAME="isbn" --></td>
+                <td><!-- TMPL_VAR NAME="file" --></td>
+                <!-- TMPL_IF NAME="NOTMARC" -->
+                                    
+                <!-- TMPL_ELSE -->
+                <td><a href="addbiblio.pl?breedingid=<!-- TMPL_VAR NAME="id" 
-->">Add biblio</a></td>
+                <!-- /TMPL_IF -->
+            </tr>
+            <!-- /TMPL_LOOP -->
+        </table>
+    <!-- TMPL_ELSE -->
+    <p>None</p>
+    <!-- /TMPL_IF -->
+</div>
 <script type="text/JavaScript">
     document.search.q.focus();
 </script>