Updated some sieve templates

[gosa.git] / gosa-si / server / events / databases.pm

diff --git a/gosa-si/server/events/databases.pm b/gosa-si/server/events/databases.pm
index 6870505827e081406b744f3d1cb27a6f5002de92..9a6a89880245ba48ddb1ca75552dcafe9b925c0e 100644 (file)
--- a/gosa-si/server/events/databases.pm
+++ b/gosa-si/server/events/databases.pm
@@ -1,6 +1,14 @@
 package databases;
+
+use strict;
+use warnings;
+
 use Exporter;
-@ISA = qw(Exporter);
+use GOSA::GosaSupportDaemon;
+use Data::Dumper;
+
+our @ISA = qw(Exporter);
+
 my @events = (
     "get_events", 
     "query_jobdb",
@@ -15,12 +23,8 @@ my @events = (
     "query_fai_release",
     "count_fai_release",
     );
-@EXPORT = @events;
 
-use strict;
-use warnings;
-use GOSA::GosaSupportDaemon;
-use Data::Dumper;
+our @EXPORT = @events;
 
 BEGIN {}
 
@@ -80,7 +84,7 @@ sub query_db {
     return @out_msg_l;
 }
     
-sub count_fai_releas{ return &count_db( @_ ); }    
+sub count_fai_release{ return &count_db( @_ ); }    
 sub count_fai_server{ return &count_db( @_ ); }
 sub count_packages_list{ return &count_db( @_ ); }
 sub count_jobdb{ return &count_db( @_ ); }
@@ -103,14 +107,10 @@ sub count_db {
         $db = $main::fai_server_db;
     } elsif( $header =~ /count_fai_release/ ) {
         $table = $main::fai_release_tn;
-        $db = $main::fai_server_db;
+        $db = $main::fai_release_db;
     }
 
-
-    # prepare sql statement and execute query
-    my $res_hash = $db->select_dbentry("SELECT * FROM $table");
-
-    my $count = keys(%{$res_hash});
+               my $count = $db->count_dbentries($table);
     my $out_xml= "<xml><header>answer</header><source>$target</source><target>$source</target><count>$count</count><session_id>$session_id</session_id></xml>";
     my $forward_to_gosa = @{$msg_hash->{'forward_to_gosa'}}[0];
     if (defined $forward_to_gosa) {
@@ -143,9 +143,7 @@ sub delete_jobdb_entry {
     #}
 
     # set job to status 'done', job will be deleted automatically
-    my $sql_statement = "UPDATE $main::job_queue_tn ".
-        "SET status='done', modified='1' ".
-        "$where";
+    my $sql_statement = "UPDATE $main::job_queue_tn SET status='done', modified='1', periodic='none' $where";
     &main::daemon_log("$session_id DEBUG: $sql_statement", 7);
     my $res = $main::job_db->update_dbentry( $sql_statement );