From: Ryan Higgins <rch@liblime.com>
Date: Wed, 9 Jan 2008 03:36:49 +0000 (-0600)
Subject: Use serialitems table to link to serial in Items.pm
X-Git-Tag: v3.00.00-beta~636
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=8db4bc73a05a867e93da5bef3fe3f137d2501265;p=koha.git

Use serialitems table to link to serial in Items.pm

Also update staff client with serialseq and publisheddate for serial items.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---

diff --git a/C4/Items.pm b/C4/Items.pm
index 975e0c89e6..1c6cf324aa 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -138,9 +138,10 @@ sub GetItem {
         $data = $sth->fetchrow_hashref;
     }
     if ( $serial) {      
-    my $ssth = $dbh->prepare("SELECT serialseq,publisheddate from serial where itemnumber=?");
+    my $ssth = $dbh->prepare("SELECT serialseq,publisheddate from serialitems left join serial on serialitems.serialid=serial.serialid where serialitems.itemnumber=?");
         $ssth->execute($data->{'itemnumber'}) ;
         ($data->{'serialseq'} , $data->{'publisheddate'}) = $ssth->fetchrow_array();
+		warn $data->{'serialseq'} , $data->{'publisheddate'};
     }		
     return $data;
 }    # sub GetItem
@@ -1098,8 +1099,9 @@ sub GetItemsInfo {
         WHERE  itemnumber = ?
             AND returndate IS NULL"
        );
-	my $ssth = $dbh->prepare("SELECT serialseq,publisheddate from serial where itemnumber=?");
+	my $ssth = $dbh->prepare("SELECT serialseq,publisheddate from serialitems left join serial on serialitems.serialid=serial.serialid where serialitems.itemnumber=? "); 
 	while ( my $data = $sth->fetchrow_hashref ) {
+	   warn $data->{itemnumber};
         my $datedue = '';
         $isth->execute( $data->{'itemnumber'} );
         if ( my $idata = $isth->fetchrow_hashref ) {
@@ -1118,6 +1120,7 @@ sub GetItemsInfo {
 		if ( $data->{'serial'}) {	
 			$ssth->execute($data->{'itemnumber'}) ;
 			($data->{'serialseq'} , $data->{'publisheddate'}) = $ssth->fetchrow_array();
+			warn $data->{'serialseq'} , $data->{'publisheddate'};
 			$serial = 1;
         }
 		if ( $datedue eq '' ) {
@@ -1586,9 +1589,6 @@ Perform the actual insert into the C<items> table.
 sub _koha_new_item {
     my ( $dbh, $item, $barcode ) = @_;
     my $error;
-use Data::Dumper;
-warn Dumper($item);
-warn $barcode;
     my $query =
            "INSERT INTO items SET
             biblionumber        = ?,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index 9436e63fdd..85f3359183 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -220,8 +220,11 @@ function verify_images() {
                     </td>
                     <td><!-- TMPL_VAR NAME="datelastseen" --></td>
                     <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->#item<!-- TMPL_VAR NAME="barcode">"><!-- TMPL_VAR NAME="barcode" --></a></td>
-                    <td><!-- TMPL_VAR NAME="volumeddesc" --></td>
-
+                    <!-- TMPL_IF NAME="serial" -->
+					 <td><!-- TMPL_VAR NAME="serialseq" --><!-- TMPL_IF NAME="publisheddate" --> (<!-- TMPL_VAR NAME="publisheddate" -->)<!-- /TMPL_IF --></td>
+					<!-- TMPL_ELSE -->
+					 <td><!-- TMPL_VAR NAME="volumeddesc" --></td>
+					<!-- /TMPL_IF -->
                 <!-- TMPL_IF NAME="type" -->
                     <td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Fix Itemtype</a></td>
                 <!-- /TMPL_IF -->