[Koha-cvs] koha/opac opac-detail.pl

[Chris Cormack]

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     Chris Cormack <rangi>   06/06/17 03:43:57

Modified files:
        opac           : opac-detail.pl 

Log message:
        Tidying up formatting

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-detail.pl?cvsroot=koha&r1=1.28&r2=1.29

Patches:
Index: opac-detail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- opac-detail.pl      17 Jun 2006 03:42:56 -0000      1.28
+++ opac-detail.pl      17 Jun 2006 03:43:57 -0000      1.29
@@ -11,125 +11,137 @@
 use C4::Amazon;
 use C4::Review;
 
-
-my $query=new CGI;
-my ($template, $borrowernumber, $cookie) 
-    = get_template_and_user({template_name => "opac-detail.tmpl",
+my $query = new CGI;
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "opac-detail.tmpl",
                             query => $query,
                             type => "opac",
                             authnotrequired => 1,
-                            flagsrequired => {borrow => 1},
-                            });
-
-my $biblionumber=$query->param('bib');
-$template->param(biblionumber => $biblionumber);
+        flagsrequired   => { borrow => 1 },
+    }
+);
 
+my $biblionumber = $query->param('bib');
+$template->param( biblionumber => $biblionumber );
 
 # change back when ive fixed request.pl
-my @items                                 = &ItemInfo(undef, $biblionumber, 
'opac');
+my @items = &ItemInfo( undef, $biblionumber, 'opac' );
 my $dat                                   = &bibdata($biblionumber);
-my ($authorcount, $addauthor)             = &getaddauthor($biblionumber);
-my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
-my ($websitecount, @websites)             = &getwebsites($biblionumber);
+my ( $authorcount,        $addauthor )      = &getaddauthor($biblionumber);
+my ( $webbiblioitemcount, @webbiblioitems ) = 
&getwebbiblioitems($biblionumber);
+my ( $websitecount,       @websites )       = &getwebsites($biblionumber);
 my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
 
- #coping with subscriptions
- my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
- my @subscriptions = 
getsubscriptions($dat->{title},$dat->{issn},$biblionumber);
- my @subs;
- foreach my $subscription (@subscriptions){
+#coping with subscriptions
+my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
+my @subscriptions       =
+  getsubscriptions( $dat->{title}, $dat->{issn}, $biblionumber );
+my @subs;
+foreach my $subscription (@subscriptions) {
        my %cell;
-       $cell{subscriptionid}= $subscription->{subscriptionid};
-       $cell{subscriptionnotes}= $subscription->{notes};
+    $cell{subscriptionid}    = $subscription->{subscriptionid};
+    $cell{subscriptionnotes} = $subscription->{notes};
+
        #get the three latest serials.
-       
$cell{latestserials}=getlatestserials($subscription->{subscriptionid},3);
+    $cell{latestserials} =
+      getlatestserials( $subscription->{subscriptionid}, 3 );
        push @subs, \%cell;
- }
+}
  
-$dat->{'count'address@hidden;
+$dat->{'count'} = @items;
 my @author;
-if ($dat->{'author'}){
+if ( $dat->{'author'} ) {
        my %authorpush; 
-       $authorpush{author}=$dat->{'author'};
-       push @author, \%authorpush
+    $authorpush{author} = $dat->{'author'};
+    push @author, \%authorpush;
 }
-$dat->{'additional'}=$addauthor->[0]->{'author'};
-if ($dat->{'additional'}){
+$dat->{'additional'} = $addauthor->[0]->{'author'};
+if ( $dat->{'additional'} ) {
        my %authorpush;
-       $authorpush{author} =$addauthor->[0]->{'author'};
-       push @author, \%authorpush
+    $authorpush{author} = $addauthor->[0]->{'author'};
+    push @author, \%authorpush;
 }
 my @title;
-foreach my $word (split(" ", $dat->{'title'})){
-        unless (length($word) == 4){
-                $word =~s/\%//g
+foreach my $word ( split( " ", $dat->{'title'} ) ) {
+    unless ( length($word) == 4 ) {
+        $word =~ s/\%//g;
         }
-        unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {
+    unless ( C4::Context->stopwords->{ uc($word) } or length($word) == 1 ) {
         my %titlepush;
-        $titlepush{title} =$word;
+        $titlepush{title} = $word;
                 push @title, \%titlepush;
-        }#it's NOT a stopword => use it. Otherwise, ignore
+    }    #it's NOT a stopword => use it. Otherwise, ignore
 }
 
-for (my $i = 1; $i < $authorcount; $i++) {
+for ( my $i = 1 ; $i < $authorcount ; $i++ ) {
         $dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
     
         my %authorpush;
-        $authorpush{author}=$addauthor->[$i]->{'author'};
-        push @author, \%authorpush
+    $authorpush{author} = $addauthor->[$i]->{'author'};
+    push @author, \%authorpush;
 } # for
 
 my $norequests = 1;
 foreach my $itm (@items) {
-    $norequests = 0 unless (($itm->{'wthdrawn'}) || ($itm->{'itemlost'}) || 
($itm->{'notforloan'}) || ($itm->{'itemnotforloan'}) || 
(!$itm->{'itemnumber'}));
-    $itm->{$itm->{'publictype'}} = 1;
+    $norequests = 0
+      unless ( ( $itm->{'wthdrawn'} )
+        || ( $itm->{'itemlost'} )
+        || ( $itm->{'notforloan'} )
+        || ( $itm->{'itemnotforloan'} )
+        || ( !$itm->{'itemnumber'} ) );
+    $itm->{ $itm->{'publictype'} } = 1;
 }
 
-$template->param(norequests => $norequests);
+$template->param( norequests => $norequests );
 
-  ## get notes and subjects from MARC record
+## get notes and subjects from MARC record
 my $marc = C4::Context->preference("marc");
-my @results = ($dat,);
-if (C4::Boolean::true_p($marc)) {
+my @results = ( $dat, );
+if ( C4::Boolean::true_p($marc) ) {
        my $dbh = C4::Context->dbh;
-       my $bibid = 
&MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber);
+    my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber( $dbh, $biblionumber 
);
        my $marcflavour = C4::Context->preference("marcflavour");
-       my $marcnotesarray = &getMARCnotes($dbh,$bibid,$marcflavour);
+    my $marcnotesarray = &getMARCnotes( $dbh, $bibid, $marcflavour );
        $results[0]->{MARCNOTES} = $marcnotesarray;
-       my $marcsubjctsarray = &getMARCsubjects($dbh,$bibid,$marcflavour);
+    my $marcsubjctsarray = &getMARCsubjects( $dbh, $bibid, $marcflavour );
        $results[0]->{MARCSUBJCTS} = $marcsubjctsarray;
-#      $template->param(MARCNOTES => $marcnotesarray);
-#      $template->param(MARCSUBJCTS => $marcsubjctsarray);
+
+    #  $template->param(MARCNOTES => $marcnotesarray);
+    #  $template->param(MARCSUBJCTS => $marcsubjctsarray);
 }
 
 # get the number of reviews
-my $reviewcount=numberofreviews($biblionumber);
-$dat->{'reviews'}=$reviewcount;
-
-my @results = ($dat,);
-my address@hidden;
-my address@hidden;
-my address@hidden;
-my address@hidden;
-my address@hidden;
-my address@hidden;
+my $reviewcount = numberofreviews($biblionumber);
+$dat->{'reviews'} = $reviewcount;
 
+my @results      = ( $dat, );
+my $resultsarray = address@hidden;
+my $itemsarray   = address@hidden;
+my $webarray     = address@hidden;
+my $sitearray    = address@hidden;
+my $titlewords   = address@hidden;
+my $authorwords  = address@hidden;
 
 #coping with subscriptions
 my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
-my @subscriptions = getsubscriptions($dat->{title},$dat->{issn},$biblionumber);
+my @subscriptions       =
+  getsubscriptions( $dat->{title}, $dat->{issn}, $biblionumber );
 my @subs;
-foreach my $subscription (@subscriptions){
-       warn "subsid :".$subscription->{subscriptionid};
+foreach my $subscription (@subscriptions) {
+    warn "subsid :" . $subscription->{subscriptionid};
        my %cell;
-       $cell{subscriptionid}= $subscription->{subscriptionid};
-       $cell{subscriptionnotes}= $subscription->{notes};
+    $cell{subscriptionid}    = $subscription->{subscriptionid};
+    $cell{subscriptionnotes} = $subscription->{notes};
+
        #get the three latest serials.
-       
$cell{latestserials}=getlatestserials($subscription->{subscriptionid},3);
+    $cell{latestserials} =
+      getlatestserials( $subscription->{subscriptionid}, 3 );
        push @subs, \%cell;
 }
 
-$template->param(BIBLIO_RESULTS => $resultsarray,
+$template->param(
+    BIBLIO_RESULTS      => $resultsarray,
                                ITEM_RESULTS => $itemsarray,
                                WEB_RESULTS => $webarray,
                                SITE_RESULTS => $sitearray,
@@ -143,35 +155,39 @@
 );
 ## Amazon.com stuff
 #not used unless preference set
-if (C4::Context->preference("AmazonContent")==1) {
+if ( C4::Context->preference("AmazonContent") == 1 ) {
        use C4::Amazon;
-       $dat->{'amazonisbn'}=$dat->{'isbn'};
+    $dat->{'amazonisbn'} = $dat->{'isbn'};
        $dat->{'amazonisbn'} =~ s|-||g;
 
        $template->param( amazonisbn => $dat->{amazonisbn} );
 
-       my $amazon_details = &get_amazon_details($dat->{amazonisbn});
+    my $amazon_details = &get_amazon_details( $dat->{amazonisbn} );
 
-       foreach my $result (@{$amazon_details->{Details}}){
-               $template->param(item_description => 
$result->{ProductDescription});
-               $template->param(image => $result->{ImageUrlMedium});
-               $template->param(list_price => $result->{ListPrice});
-               $template->param(amazon_url => $result->{url});
+    foreach my $result ( @{ $amazon_details->{Details} } ) {
+        $template->param( item_description => $result->{ProductDescription} );
+        $template->param( image            => $result->{ImageUrlMedium} );
+        $template->param( list_price       => $result->{ListPrice} );
+        $template->param( amazon_url       => $result->{url} );
        }
 
        my @products;
        my @reviews;
-       for my $details( @{ $amazon_details->{ Details } } ) {
-               next unless $details->{ SimilarProducts };
-               for my $product ( @{ $details->{ SimilarProducts }->{ Product } 
} ) {
+    for my $details ( @{ $amazon_details->{Details} } ) {
+        next unless $details->{SimilarProducts};
+        for my $product ( @{ $details->{SimilarProducts}->{Product} } ) {
                        push @products, +{ Product => $product };
                }
-               next unless $details->{ Reviews };
-               for my $product ( @{ $details->{ Reviews }->{ AvgCustomerRating 
} } ) {
-                       $template->param(rating => $product * 20);
-               }
-               for my $reviews ( @{ $details->{ Reviews }->{ CustomerReview } 
} ) {
-                       push @reviews, +{ Summary => $reviews->{ Summary }, 
Comment => $reviews->{ Comment }, };
+        next unless $details->{Reviews};
+        for my $product ( @{ $details->{Reviews}->{AvgCustomerRating} } ) {
+            $template->param( rating => $product * 20 );
+        }
+        for my $reviews ( @{ $details->{Reviews}->{CustomerReview} } ) {
+            push @reviews,
+              +{
+                Summary => $reviews->{Summary},
+                Comment => $reviews->{Comment},
+              };
                }
        }
        $template->param( SIMILAR_PRODUCTS => address@hidden );