[Koha-cvs] CVS: koha request.pl,1.11,1.12

[Finlay Thompson]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv7872

Modified Files:
        request.pl 
Log Message:

Fixed up the display of bibitems, implemented some restrictions on which items 
can be reserved.


Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** request.pl  21 Aug 2002 04:31:25 -0000      1.11
--- request.pl  22 Aug 2002 02:31:58 -0000      1.12
***************
*** 70,78 ****
  my ($count2,@data) = bibitems($bib);
  my $bibitemrows = "";
  for (my $i=0; $i<$count2; $i++) {
      my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
!     if ($data[$i]->{'dewey'} == 0){
!       $data[$i]->{'dewey'}="";
      }
      $data[$i]->{'volumeddesc'} = "&nbsp;" unless $data[$i]->{'volumeddesc'};
      $data[$i]->{'dewey'}=~ s/\.0000$//;
--- 70,88 ----
  my ($count2,@data) = bibitems($bib);
  my $bibitemrows = "";
+ 
+ 
  for (my $i=0; $i<$count2; $i++) {
      my @barcodes = barcodes($data[$i]->{'biblioitemnumber'});
!     my $barcodestext = "";
!     foreach my $num (@barcodes) {
!       my $message = $num->{'itemlost'} == 1 ? "(lost)" :
!           $num->{'itemlost'} == 2 ? "(long overdue)" : "";
!       $barcodestext .= "$num->{'barcode'} $message <br>";
      }
+     $barcodestext = substr($barcodestext, 0, -4);
+ 
+     $data[$i]->{'dewey'}="" if ($data[$i]->{'dewey'} == 0);
+ 
+     warn "Itemlost: $data[$i]->{itemlost} \n";
      $data[$i]->{'volumeddesc'} = "&nbsp;" unless $data[$i]->{'volumeddesc'};
      $data[$i]->{'dewey'}=~ s/\.0000$//;
***************
*** 80,91 ****
      my 
$class="$data[$i]->{'classification'}$data[$i]->{'dewey'}$data[$i]->{'subclass'}";
      my $select;
!     if ($data[$i]->{'notforloan'}) {
!       $select = "Reference Item.";
!     } elsif ($data[$i]->{'itemlost'} == 1) {
!       $select = "Item Lost";
!     } elsif ($data[$i]->{'itemlost'} == 2) {
!       $select = "Long Overdue";
!     } elsif ($data[$i]->{'wthdrawn'}) {
!       $select = "Item Cancelled";
      } else {
        $select = " <input type=checkbox name=reqbib 
value=$data[$i]->{'biblioitemnumber'}><input type=hidden name=biblioitem 
value=$data[$i]->{'biblioitemnumber'}>";
--- 90,97 ----
      my 
$class="$data[$i]->{'classification'}$data[$i]->{'dewey'}$data[$i]->{'subclass'}";
      my $select;
!     if (($data[$i]->{'notforloan'}) 
!       || ($data[$i]->{'itemlost'} == 1)
!       || ($data[$i]->{'itemlost'} == 2))  {
!       $select = "Cannot be reserved.";
      } else {
        $select = " <input type=checkbox name=reqbib 
value=$data[$i]->{'biblioitemnumber'}><input type=hidden name=biblioitem 
value=$data[$i]->{'biblioitemnumber'}>";
***************
*** 97,104 ****
  <TD>$class</td>
  <td>$data[$i]->{'volumeddesc'}</td>
- <td>$data[$i]->{'isbn'}</td>
- <td>$dat->{'copyrightdate'}</td>
  <td>$data[$i]->{'publicationyear'}</td>
! <td>@barcodes</td>
  </tr>
  EOF
--- 103,108 ----
  <TD>$class</td>
  <td>$data[$i]->{'volumeddesc'}</td>
  <td>$data[$i]->{'publicationyear'}</td>
! <td>$barcodestext</td>
  </tr>
  EOF
***************
*** 139,146 ****
        $rank = "<select name=rank-request>$prioropt<option 
value=del>Del</select>";
        $pickup = "<select name=pickup>$bropt</select>";
-         $change = "<select name=itemtype>
-                    <option value=next>Next Available
-                    <option value=change>Change Selection
-                    <option value=nc >No Change</select>";
      }
      $existingreserves .= <<"EOF";
--- 143,146 ----
***************
*** 156,160 ****
  <TD>$pickup</td>
  <TD>$type</td>
- <TD>$change</td>
  </tr>
  EOF
--- 156,159 ----
***************
*** 254,259 ****
  <td  bgcolor="99cc33" 
background="/images/background-mem.gif"><B>Classification</b></TD>
  <td  bgcolor="99cc33" 
background="/images/background-mem.gif"><B>Volume</b></TD>
- <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>ISBN</b></TD>
- <td  bgcolor="99cc33" 
background="/images/background-mem.gif"><B>Copyright</b></TD>
  <td  bgcolor="99cc33" 
background="/images/background-mem.gif"><B>Pubdate</b></TD>
  <td  bgcolor="99cc33" 
background="/images/background-mem.gif"><B>Copies</b></TD>
--- 253,256 ----
***************
*** 284,288 ****
  <td  bgcolor="99cc33" 
background="/images/background-mem.gif"><B>Pickup</b></TD>
  <td  bgcolor="99cc33" 
background="/images/background-mem.gif"><B>Request</b></TD>
- <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Change 
To</b></TD>
  </TR>
  $existingreserves
--- 281,284 ----