Added DBsqlite to sed rewrite.

[gosa.git] / gosa-si / modules / GosaPackages.pm

diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm
index 787b7ce00c51bed47a66b6562855a53b7962afbe..17a731bab481a6e701b1116f1c57a743b8e81728 100644 (file)
--- a/gosa-si/modules/GosaPackages.pm
+++ b/gosa-si/modules/GosaPackages.pm
@@ -11,7 +11,7 @@ use Socket;
 use XML::Simple;
 use File::Spec;
 use Data::Dumper;
-use GOSA::DBsqlite;
+use GOSA::DBmysql;
 use MIME::Base64;
 
 my $event_dir = "/usr/lib/gosa-si/server/GosaPackages";
@@ -44,12 +44,22 @@ foreach my $log_line (@$result) {
     }
 }
 
+# build vice versa event_hash, event_name => module
+my $event2module_hash = {};
+while (my ($module, $mod_events) = each %$event_hash) {
+    while (my ($event_name, $nothing) = each %$mod_events) {
+        $event2module_hash->{$event_name} = $module;
+    }
+
+}
+
 
 ## FUNCTIONS #################################################################
 
 sub get_module_info {
     my @info = ($main::gosa_address,
                 $main::gosa_passwd,
+                $event_hash,
                 );
     return \@info;
 }
@@ -156,11 +166,11 @@ sub process_gosa_msg {
     my $target = @{$msg_hash->{'target'}}[0];
 
     # check local installed events
-    if( exists $event_hash->{$header} ) {
+    if( exists $event2module_hash->{$header} ) {
         # a event exists with the header as name
-        &main::daemon_log("$session_id INFO: found event '$header' at event-module '".$event_hash->{$header}."'", 5);
+        &main::daemon_log("$session_id INFO: found event '$header' at event-module '".$event2module_hash->{$header}."'", 5);
         no strict 'refs';
-        @out_msg_l = &{$event_hash->{$header}."::$header"}( $msg, $msg_hash, $session_id );
+        @out_msg_l = &{$event2module_hash->{$header}."::$header"}( $msg, $msg_hash, $session_id );
 
     # check client registered events
     } else {
@@ -247,6 +257,7 @@ sub process_job_msg {
             &daemon_log("$session_id ERROR: opsi_install_client-message has no xml-tag 'hostID', job was not created: $msg", 1);
         } else {
             $plain_name = $msg_hash->{'hostId'}[0];
+            $header = "trigger_action_reinstall"
         }
 
     } else {   # Try to determine plain_name via ladp search
@@ -260,7 +271,7 @@ sub process_job_msg {
                     scope => 'sub',
                     attrs => ['cn'],
                     filter => "(macAddress=$macaddress)");
-            if($mesg->code) {
+            if($mesg->code || ($mesg->count!=1)) {
                 &main::daemon_log($mesg->error, 1);
                 $plain_name = "none";
             } else {