removing useless code

[koha.git] / serials / serials-edit.pl

diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl
index 2277174..e59ea7a 100755 (executable)
--- a/serials/serials-edit.pl
+++ b/serials/serials-edit.pl
@@ -17,7 +17,6 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id$
 
 =head1 NAME
 
@@ -70,7 +69,6 @@ use C4::Date;
 use C4::Biblio;
 use C4::Koha;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use C4::Serials;
 
@@ -102,6 +100,12 @@ unless (@serialids){
   }
 }
 
+unless (scalar(@serialids)){
+  my $string="serials-collection.pl?subscriptionid=".join(",",@subscriptionids);
+  $string=~s/,$//;
+ warn $string; 
+  print $query->redirect($string);
+}
 my ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "serials/serials-edit.tmpl",
                 query => $query,
@@ -116,8 +120,10 @@ foreach my $tmpserialid (@serialids){
   my $data=GetSerialInformation($tmpserialid);
   $data->{publisheddate}=format_date($data->{publisheddate});
   $data->{planneddate}=format_date($data->{planneddate});
+  $data->{'editdisable'}=(HasSubscriptionExpired($data->{subscriptionid})&& $data->{'status1'});
   push @serialdatalist,$data;
 }
+my $bibdata=GetBiblioData($serialdatalist[0]->{'biblionumber'});
 
 my @newserialloop;
 my @subscriptionloop;
@@ -129,12 +135,14 @@ foreach my $subscriptionid (@subscriptionids){
       PrepareItemrecordDisplay( $serialdatalist[0]->{'biblionumber'} );
   }
   $cell->{'subscriptionid'}=$subscriptionid;
-  $cell->{'subscriptionexpired'}=HasSubscriptionExpired($subscriptionid);
   $cell->{'itemid'}       = "NNEW";
   $cell->{'serialid'}     = "NEW";
   $cell->{'issuesatonce'}   = 1;
   push @newserialloop,$cell;
-  push @subscriptionloop, {'subscriptionid'=>$subscriptionid};
+  push @subscriptionloop, {'subscriptionid'=>$subscriptionid,
+                           'abouttoexpire'=>abouttoexpire($subscriptionid),
+                           'subscriptionexpired'=>HasSubscriptionExpired($subscriptionid),
+  };
 }
 $template->param(newserialloop=>\@newserialloop);
 $template->param(subscriptions=>\@subscriptionloop);
@@ -202,7 +210,7 @@ if ($op eq 'serialchangestatus') {
           $index = $i if ($itemhash{$item}->{'serial'} eq $serialids[$i]);
         }
         if ($status[$index]==2){
-          my $xml = MARChtml2xml( $itemhash{$item}->{'tags'},
+          my $xml = TransformHtmlToXml( $itemhash{$item}->{'tags'},
                                   $itemhash{$item}->{'subfields'},
                                   $itemhash{$item}->{'field_values'},
                                   $itemhash{$item}->{'ind_tag'},
@@ -212,7 +220,7 @@ if ($op eq 'serialchangestatus') {
           if ($item=~/^N/){
             #New Item
             # if autoBarcode is ON, calculate barcode...
-            my ($tagfield,$tagsubfield) = &MARCfind_marc_from_kohafield($dbh,"items.barcode");
+            my ($tagfield,$tagsubfield) = &GetMarcFromKohaField("items.barcode");
             if (C4::Context->preference('autoBarcode')) {
               unless ($record->field($tagfield)->subfield($tagsubfield)) {
                 my $sth_barcode = $dbh->prepare("select max(abs(barcode)) from items");
@@ -227,7 +235,7 @@ if ($op eq 'serialchangestatus') {
               }
             }
             # check for item barcode # being unique
-            my $exists = GetItemFromBarcode($record->subfield($tagfield,$tagsubfield)) if ($record->subfield($tagfield,$tagsubfield));
+            my $exists = GetItemnumberFromBarcode($record->subfield($tagfield,$tagsubfield)) if ($record->subfield($tagfield,$tagsubfield));
   #           push @errors,"barcode_not_unique" if($exists);
             $template->param("barcode_not_unique" => 1,'errserialseq'=>$serialseqs[$index]);
             # if barcode exists, don't create, but report The problem.
@@ -242,7 +250,19 @@ if ($op eq 'serialchangestatus') {
         }
       }
     }
-    print $query->redirect("serials-collection.pl?biblionumber=".$serialdatalist[0]->{biblionumber});
+#     ### FIXME this part of code is not very pretty. Nor is it very efficient... There MUST be a more perlish way to write it. But it works.     
+#     my $redirect ="serials-home.pl?";
+#     $redirect.=join("&",map{"serialseq=".$_} @serialseqs);
+#     $redirect.="&".join("&",map{"planneddate=".$_} @planneddates);
+#     $redirect.="&".join("&",map{"publisheddate=".$_} @publisheddates);
+#     $redirect.="&".join("&",map{"status=".$_} @status);
+#     $redirect.="&".join("&",map{"notes=".$_} @notes);
+
+     my $redirect ="serials-collection.pl?";
+     my %hashsubscription;
+     map{$hashsubscription{$_}=1} @subscriptionids;       
+     $redirect.=join("&",map{"subscriptionid=".$_} sort keys %hashsubscription);
+    print $query->redirect("$redirect");
 }
 
 $template->param(serialsadditems =>C4::Context->preference("serialsadditems"));
@@ -250,10 +270,8 @@ $template->param(serialsadditems =>C4::Context->preference("serialsadditems"));
 
 
 $template->param(
+            bibliotitle => $bibdata->{'title'},
             biblionumber =>$serialdatalist[0]->{'biblionumber'},
             serialslist => \@serialdatalist,
-            intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-            intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-            IntranetNav => C4::Context->preference("IntranetNav"),
         );
 output_html_with_http_headers $query, $cookie, $template->output;