Bug 10403: (follow-up) fix test to use vendor created earlier during test

[koha.git] / C4 / Maintainance.pm

diff --git a/C4/Maintainance.pm b/C4/Maintainance.pm
index 6f749bc..8726ef9 100644 (file)
--- a/C4/Maintainance.pm
+++ b/C4/Maintainance.pm
@@ -16,11 +16,12 @@ package C4::Maintainance; #assumes C4/Maintainance
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use C4::Context;
 
 require Exporter;
@@ -28,7 +29,7 @@ require Exporter;
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = 0.01;
+$VERSION = 3.07.00.049;
 
 =head1 NAME
 
@@ -46,15 +47,13 @@ miscategorized items, etc.
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 @ISA = qw(Exporter);
-@EXPORT = qw(&listsubjects &updatesub &shiftgroup &deletedbib &undeletebib
-&updatetype);
+@EXPORT = qw(&listsubjects &shiftgroup &deletedbib &undeletebib
+&updatetype &logaction);
 
-=item listsubjects
+=head2 listsubjects
 
   ($count, $results) = &listsubjects($subject, $n, $offset);
 
@@ -73,21 +72,24 @@ C<&listsubject> returns up to C<$n> items, starting at C<$offset>. If
 C<$n> is 0, it will return all matching subjects.
 
 =cut
+
 #'
 # FIXME - This API is bogus. The way it's currently used, it should
 # just return a list of strings.
 sub listsubjects {
   my ($sub,$num,$offset)=@_;
   my $dbh = C4::Context->dbh;
-  my $query="Select * from bibliosubject where subject like '$sub%' group by subject";
+  my $query="Select * from bibliosubject where subject like ? group by subject";
+  my @bind = ("$sub%");
   # FIXME - Make $num and $offset optional.
   # If $num was given, make sure $offset was, too.
   if ($num != 0){
-    $query.=" limit $offset,$num";
+    $query.=" limit ?,?";
+    push(@bind,$offset,$num);
   }
   my $sth=$dbh->prepare($query);
 #  print $query;
-  $sth->execute;
+  $sth->execute(@bind);
   my @results;
   my $i=0;
   while (my $data=$sth->fetchrow_hashref){
@@ -98,28 +100,7 @@ sub listsubjects {
   return($i,\@results);
 }
 
-=item updatesub
-
-  &updatesub($newsubject, $oldsubject);
-
-Renames a subject from C<$oldsubject> to C<$newsubject> in the
-bibliosubject table of the Koha database.
-
-=cut
-#'
-sub updatesub{
-  my ($sub,$oldsub)=@_;
-  my $dbh = C4::Context->dbh;
-  $sub=$dbh->quote($sub);
-  $oldsub=$dbh->quote($oldsub);
-  # FIXME - Just use $dbh->do();
-  my $query="update bibliosubject set subject=$sub where subject=$oldsub";
-  my $sth=$dbh->prepare($query);
-  $sth->execute;
-  $sth->finish;
-}
-
-=item shiftgroup
+=head2 shiftgroup
 
   &shiftgroup($biblionumber, $biblioitemnumber);
 
@@ -128,23 +109,20 @@ C<$biblioitemnumber> is the number of the biblioitem to change.
 C<$biblionumber> is the biblionumber to associate it with.
 
 =cut
+
 #'
 sub shiftgroup{
-  my ($bib,$bi)=@_;
+  my ($biblionumber,$bi)=@_;
   my $dbh = C4::Context->dbh;
-  # FIXME - Just use $dbh->do();
-  my $query="update biblioitems set biblionumber=$bib where biblioitemnumber=$bi";
-  my $sth=$dbh->prepare($query);
-  $sth->execute;
+  my $sth=$dbh->prepare("update biblioitems set biblionumber=? where biblioitemnumber=?");
+  $sth->execute($biblionumber,$bi);
   $sth->finish;
-  # FIXME - Just use $dbh->do();
-  $query="update items set biblionumber=$bib where biblioitemnumber=$bi";
-  $sth=$dbh->prepare($query);
-  $sth->execute;
+  $sth=$dbh->prepare("update items set biblionumber=? where biblioitemnumber=?");
+  $sth->execute($biblionumber,$bi);
   $sth->finish;
 }
 
-=item deletedbib
+=head2 deletedbib
 
   ($count, $results) = &deletedbib($title);
 
@@ -156,13 +134,13 @@ the fields of the deletedbiblio table in the Koha database. C<$count>
 is the number of elements in C<$results>.
 
 =cut
+
 #'
 sub deletedbib{
   my ($title)=@_;
   my $dbh = C4::Context->dbh;
-  my $query="Select * from deletedbiblio where title like '$title%' order by title";
-  my $sth=$dbh->prepare($query);
-  $sth->execute;
+  my $sth=$dbh->prepare("Select * from deletedbiblio where title like ? order by title");
+  $sth->execute("$title%");
   my @results;
   my $i=0;
   while (my $data=$sth->fetchrow_hashref){
@@ -173,7 +151,7 @@ sub deletedbib{
   return($i,\@results);
 }
 
-=item undeletebib
+=head2 undeletebib
 
   &undeletebib($biblionumber);
 
@@ -182,35 +160,32 @@ biblionumber in the deletedbiblio table of the Koha database, and
 moves its entry to the biblio table.
 
 =cut
+
 #'
 sub undeletebib{
-  my ($bib)=@_;
+  my ($biblionumber)=@_;
   my $dbh = C4::Context->dbh;
-  my $query="select * from deletedbiblio where biblionumber=$bib";
-  my $sth=$dbh->prepare($query);
-  $sth->execute;
+  my $sth=$dbh->prepare("select * from deletedbiblio where biblionumber=?");
+  $sth->execute($biblionumber);
   if (my @data=$sth->fetchrow_array){
     $sth->finish;
     # FIXME - Doesn't this keep the same biblionumber? Isn't this
     # forbidden by the definition of 'biblio'? Or doesn't it matter?
-    $query="Insert into biblio values (";
-    foreach my $temp (@data){
-      $temp=~ s/\'/\\\'/g;
-      $query=$query."'$temp',";
-    }
+    my $query="INSERT INTO biblio VALUES (";
+   my $count = @data;
+    $query .= ("?," x $count);
     $query=~ s/\,$/\)/;
     #   print $query;
     $sth=$dbh->prepare($query);
-    $sth->execute;
+    $sth->execute(@data);
     $sth->finish;
   }
-  $query="Delete from deletedbiblio where biblionumber=$bib";
-  $sth=$dbh->prepare($query);
-  $sth->execute;
+  $sth=$dbh->prepare("DELETE FROM deletedbiblio WHERE biblionumber=?");
+  $sth->execute($biblionumber);
   $sth->finish;
 }
 
-=item updatetype
+=head2 updatetype
 
   &updatetype($biblioitemnumber, $itemtype);
 
@@ -218,13 +193,13 @@ Changes the type of the item with the given biblioitemnumber to be
 C<$itemtype>.
 
 =cut
+
 #'
 sub updatetype{
   my ($bi,$type)=@_;
   my $dbh = C4::Context->dbh;
-  # FIXME - Use $dbh->do(...);
-  my $sth=$dbh->prepare("Update biblioitems set itemtype='$type' where biblioitemnumber=$bi");
-  $sth->execute;
+  my $sth=$dbh->prepare("Update biblioitems set itemtype=? where biblioitemnumber=?");
+  $sth->execute($type,$bi);
   $sth->finish;
 }
 
@@ -233,10 +208,8 @@ END { }       # module clean-up code here (global destructor)
 1;
 __END__
 
-=back
-
 =head1 AUTHOR
 
-Koha Developement team <info@koha.org>
+Koha Development Team <http://koha-community.org/>
 
 =cut