MT 2116, Follow-up : Fix subfield separator

[koha.git] / C4 / Review.pm

diff --git a/C4/Review.pm b/C4/Review.pm
index 6d3f6c8..e08d24c 100644 (file)
--- a/C4/Review.pm
+++ b/C4/Review.pm
@@ -67,9 +67,7 @@ sub getreview {
       "SELECT * FROM reviews WHERE biblionumber=? and borrowernumber=?";
     my $sth = $dbh->prepare($query);
     $sth->execute( $biblionumber, $borrowernumber );
-    my $review = $sth->fetchrow_hashref();
-    $sth->finish();
-    return $review;
+    return $sth->fetchrow_hashref();
 }
 
 sub savereview {
@@ -77,20 +75,17 @@ sub savereview {
     my $dbh   = C4::Context->dbh;
     my $query = "INSERT INTO reviews (borrowernumber,biblionumber,
        review,approved,datereviewed) VALUES 
-  (?,?,?,?,now())";
+  (?,?,?,0,now())";
     my $sth = $dbh->prepare($query);
-    $sth->execute( $borrowernumber, $biblionumber, $review, 0 );
-    $sth->finish();
+    $sth->execute( $borrowernumber, $biblionumber, $review);
 }
 
 sub updatereview {
     my ( $biblionumber, $borrowernumber, $review ) = @_;
     my $dbh   = C4::Context->dbh;
-    my $query = "UPDATE reviews SET review=?,datereviewed=now(),approved=?
-  WHERE borrowernumber=? and biblionumber=?";
+    my $query = "UPDATE reviews SET review=?,datereviewed=now(),approved=0  WHERE borrowernumber=? and biblionumber=?";
     my $sth = $dbh->prepare($query);
-    $sth->execute( $review, 0, $borrowernumber, $biblionumber );
-    $sth->finish();
+    $sth->execute( $review, $borrowernumber, $biblionumber );
 }
 
 sub numberofreviews {
@@ -100,10 +95,7 @@ sub numberofreviews {
       "SELECT count(*) FROM reviews WHERE biblionumber=? and approved=?";
     my $sth = $dbh->prepare($query);
     $sth->execute( $biblionumber, 1 );
-    my $count = $sth->fetchrow_hashref;
-
-    $sth->finish();
-    return ( $count->{'count(*)'} );
+       return $sth->fetchrow;
 }
 
 sub getreviews {
@@ -113,12 +105,7 @@ sub getreviews {
 "SELECT * FROM reviews WHERE biblionumber=? and approved=? order by datereviewed desc";
     my $sth = $dbh->prepare($query) || warn $dbh->err_str;
     $sth->execute( $biblionumber, $approved );
-    my @results;
-    while ( my $data = $sth->fetchrow_hashref() ) {
-        push @results, $data;
-    }
-    $sth->finish();
-    return ( \@results );
+       return $sth->fetchall_arrayref({});
 }
 
 sub getallreviews {
@@ -128,12 +115,7 @@ sub getallreviews {
       "SELECT * FROM reviews WHERE approved=? order by datereviewed desc";
     my $sth = $dbh->prepare($query);
     $sth->execute($status);
-    my @results;
-    while ( my $data = $sth->fetchrow_hashref() ) {
-        push @results, $data;
-    }
-    $sth->finish();
-    return ( \@results );
+       return $sth->fetchall_arrayref({});
 }
 
 =head2 approvereview
@@ -152,7 +134,6 @@ sub approvereview {
                WHERE reviewid=?";
     my $sth = $dbh->prepare($query);
     $sth->execute( 1, $reviewid );
-    $sth->finish();
 }
 
 =head2 deletereview
@@ -170,7 +151,6 @@ sub deletereview {
                WHERE reviewid=?";
     my $sth = $dbh->prepare($query);
     $sth->execute($reviewid);
-    $sth->finish();
 }
 
 1;