Bug 3228: Fix for Type: label in XSLT displays.

[koha.git] / C4 / Maintainance.pm

diff --git a/C4/Maintainance.pm b/C4/Maintainance.pm
index b874577..b8a23c8 100644 (file)
--- a/C4/Maintainance.pm
+++ b/C4/Maintainance.pm
@@ -51,8 +51,8 @@ miscategorized items, etc.
 =cut
 
 @ISA = qw(Exporter);
-@EXPORT = qw(&listsubjects &updatesub &shiftgroup &deletedbib &undeletebib
-&updatetype);
+@EXPORT = qw(&listsubjects &shiftgroup &deletedbib &undeletebib
+&updatetype &logaction);
 
 =item listsubjects
 
@@ -79,8 +79,8 @@ C<$n> is 0, it will return all matching subjects.
 sub listsubjects {
   my ($sub,$num,$offset)=@_;
   my $dbh = C4::Context->dbh;
-  my $query="Select * from bibliosubject where subject like '?%' group by subject";
-  my @bind = ($sub);
+  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){
@@ -100,25 +100,6 @@ 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);
-  my $sth=$dbh->prepare("update bibliosubject set subject=? where subject=?");
-  $sth->execute($sub,$oldsub);
-  $sth->finish;
-}
-
 =item shiftgroup
 
   &shiftgroup($biblionumber, $biblioitemnumber);
@@ -130,14 +111,13 @@ C<$biblionumber> is the biblionumber to associate it with.
 =cut
 #'
 sub shiftgroup{
-  my ($bib,$bi)=@_;
+  my ($biblionumber,$bi)=@_;
   my $dbh = C4::Context->dbh;
   my $sth=$dbh->prepare("update biblioitems set biblionumber=? where biblioitemnumber=?");
-  $sth->execute($bib,$bi);
+  $sth->execute($biblionumber,$bi);
   $sth->finish;
-  $query="";
   $sth=$dbh->prepare("update items set biblionumber=? where biblioitemnumber=?");
-  $sth->execute($bib,$bi);
+  $sth->execute($biblionumber,$bi);
   $sth->finish;
 }
 
@@ -157,8 +137,8 @@ is the number of elements in C<$results>.
 sub deletedbib{
   my ($title)=@_;
   my $dbh = C4::Context->dbh;
-  my $sth=$dbh->prepare("Select * from deletedbiblio where title like '?%' order by title");
-  $sth->execute($title);
+  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){
@@ -180,24 +160,25 @@ moves its entry to the biblio table.
 =cut
 #'
 sub undeletebib{
-  my ($bib)=@_;
+  my ($biblionumber)=@_;
   my $dbh = C4::Context->dbh;
   my $sth=$dbh->prepare("select * from deletedbiblio where biblionumber=?");
-  $sth->execute($bib);
+  $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?
-    my $query="Insert into biblio values (";
-    $query .= ("?," x $#data);
+    my $query="INSERT INTO biblio VALUES (";
+   my $count = @data;
+    $query .= ("?," x $count);
     $query=~ s/\,$/\)/;
     #   print $query;
     $sth=$dbh->prepare($query);
     $sth->execute(@data);
     $sth->finish;
   }
-  $sth=$dbh->prepare("Delete from deletedbiblio where biblionumber=?");
-  $sth->execute($bib);
+  $sth=$dbh->prepare("DELETE FROM deletedbiblio WHERE biblionumber=?");
+  $sth->execute($biblionumber);
   $sth->finish;
 }