merging 1.2 and main branches

[koha_fer] / modbibitem.pl

diff --git a/modbibitem.pl b/modbibitem.pl
index 899964d..3d555c9 100755 (executable)
--- a/modbibitem.pl
+++ b/modbibitem.pl
@@ -8,17 +8,18 @@
 use strict;
 
 use C4::Search;
-use CGI;
 use C4::Output;
+use C4::Koha;
+use CGI;
+
 
 my $input = new CGI;
-#
 my $bibitemnum=$input->param('bibitem');
 my $data=bibitemdata($bibitemnum);
 my $biblio=$input->param('biblio');
 my $submit=$input->param('submit.x');
 if ($submit eq ''){                                                                                                      
-  print $input->redirect("/cgi-bin/koha/delbibitem.pl?bibitemnum=$bibitemnum&biblio=$biblio");                            
+  print $input->redirect("deletebiblioitem.pl?biblioitemnumber=$bibitemnum&biblionumber=$biblio");
 }
 print $input->header;
 #my ($count,$subject)=subject($data->{'biblionumber'});
@@ -28,7 +29,7 @@ print $input->header;
 #my ($analytictitle)=analytic($biblionumber,'t');
 #my ($analyticauthor)=analytic($biblionumber,'a');
 print startpage();
-print startmenu();
+print startmenu('catalogue');
 my %inputs;
 
 #hash is set up with input name being the key then
@@ -46,7 +47,7 @@ if ($dewey <= 0){
 $dewey=~ s/\.$//;
 $inputs{'Class'}="text\t$data->{'classification'}$dewey$data->{'subclass'}\t2";
 $inputs{'Item Type'}="text\t$data->{'itemtype'}\t3";
-#$inputs{'Subject'}="textarea\t$sub\t4";
+$inputs{'URL'}="text\t$data->{'url'}\t4";
 $inputs{'Publisher'}="text\t$data->{'publishercode'}\t5";
 #$inputs{'Copyright date'}="text\t$data->{'copyrightdate'}\t6";
 $inputs{'ISBN'}="text\t$data->{'isbn'}\t7";
@@ -85,6 +86,8 @@ for (my $i=0;$i<$count;$i++){
   print "<option value=$bibitems[$i]->{'biblioitemnumber'}>$bibitems[$i]->{'description'} - $bibitems[$i]->{'isbn'}\n";
 }
 print "</select></td></tr>";
+my $notesinput=$input->textfield(-name=>'Notes', -default=>$data->{'bnotes'}, -size=>20);
+
 print <<printend
 <TR VALIGN=TOP  bgcolor="99cc33">
 <TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=2 ><b><input type=radio name=existing value=NO checked >OR MODIFY DETAILS</b></td></tr>
@@ -93,6 +96,11 @@ print <<printend
 
 <tr valign=top bgcolor=white><td>Item Type</td><td><input type=text name=Item Type value="$data->{'itemtype'}" size=20></td></tr>
 
+<tr valign="top" bgcolor="white">
+<td>URL</td>
+<td><input type="text" name="url" value="$data->{'url'}" size="20"></td>
+</tr>
+
 <tr valign=top bgcolor=white><td>Class</td><td><input type=text name=Class value="$data->{'classification'}$dewey$data->{'subclass'}" size=20></td></tr>
 
 
@@ -112,7 +120,7 @@ print <<printend
 <tr valign=top bgcolor=white><td>Volume</td>
 <td><input type=text name=Volume value="$data->{'volumeddesc'}" size=20></td></tr>
 <tr valign=top bgcolor=white><td>Notes</td>
-<td><input type=text name=Notes value="$data->{'bnotes'}" size=20></td></tr>
+<td>$notesinput</td></tr>
 <tr valign=top bgcolor=white><td>Size</td>
 <td><input type=text name=Size value="$data->{'size'}" size=20></td></tr>
 
@@ -150,8 +158,7 @@ my (@items)=itemissues($data->{'biblioitemnumber'});
 #print @items;                                                                                      
 my $count=@items;           
 for (my $i=0;$i<$count;$i++){
-  my @temp=split('-',$items[$i]->{'datelastseen'});                                                      
-  $items[$i]->{'datelastseen'}="$temp[2]/$temp[1]/$temp[0]"; 
+  $items[$i]->{'datelastseen'} = slashifyDate($items[$i]->{'datelastseen'});                                                      
   print <<printend
 <tr valign=top gcolor=#ffffcc>
 <td><input type=checkbox name="check_group_$items[$i]->{'barcode'}"></td>