Fixed answer message.

[gosa.git] / gosa-si / gosa-si-server

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 5ee945afe0e9cf7af2abbedaef1f1339cbec1171..048089fbf0e3e28bda4d364b5494c04c3f525883 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -124,6 +124,7 @@ my @job_queue_col_names = ("id INTEGER",
                "targettag DEFAULT 'none'", 
                "xmlmessage DEFAULT 'none'", 
                "macaddress DEFAULT 'none'",
+               "plainname DEFAULT 'none'",
                );
 
 # holds all other gosa-sd as well as the gosa-sd-bus
@@ -1597,7 +1598,7 @@ sub change_goto_state {
 
 
 sub create_fai_server_db {
-    my ($table_name, $kernel) = @_;
+    my ($table_name, $kernel, $dont_create_packages_list) = @_;
        my $result;
     my $ldap_handle = &get_ldap_handle();
        if(defined($ldap_handle)) {
@@ -1631,7 +1632,9 @@ sub create_fai_server_db {
                daemon_log("INFO: create_fai_server_db: finished", 5);
 
                # TODO: Find a way to post the 'create_packages_list_db' event
-               &create_packages_list_db($ldap_handle);
+               if(!defined($dont_create_packages_list)) {
+                       &create_packages_list_db;
+               }
        }       
     
     $ldap_handle->disconnect;
@@ -1653,12 +1656,15 @@ sub run_create_fai_server_db {
 
 
 sub create_fai_release_db {
-       my ($table_name) = @_;
+       my ($table_name, $session_id) = @_;
        my $result;
 
+    # used for logging
+    if (not defined $session_id) { $session_id = "0"; }
+
     my $ldap_handle = &get_ldap_handle();
        if(defined($ldap_handle)) {
-               daemon_log("INFO: create_fai_release_db: start",5);
+               daemon_log("$session_id INFO: create_fai_release_db: start",5);
                my $mesg= $ldap_handle->search(
                        base   => $ldap_base,
                        scope  => 'sub',
@@ -1691,18 +1697,20 @@ sub create_fai_release_db {
                                        }
                                }
                        }
-                       daemon_log("DEBUG: Inserting ".scalar @sql_list." entries to DB",6);
+                       daemon_log("$session_id DEBUG: Inserting ".scalar @sql_list." entries to DB",6);
                        if(@sql_list) {
                                unshift @sql_list, "DELETE FROM $table_name";
                                $fai_server_db->exec_statementlist(\@sql_list);
                        }
-                       daemon_log("DEBUG: Done with inserting",6);
+                       daemon_log("$session_id DEBUG: Done with inserting",6);
                }
-               daemon_log("INFO: create_fai_release_db: finished",5);
+               daemon_log("$session_id INFO: create_fai_release_db: finished",5);
        }
     $ldap_handle->disconnect;
        return $result;
 }
+
+
 sub run_create_fai_release_db {
     my ($session, $heap, $table_name) = @_[SESSION, HEAP, ARG0];
     my $task = POE::Wheel::Run->new(
@@ -1955,7 +1963,7 @@ sub session_run_done {
 }
 
 sub create_sources_list {
-    my ($ldap_handle) = @_;
+    my $ldap_handle = &get_ldap_handle;
        my $result="/tmp/gosa_si_tmp_sources_list";
 
        # Remove old file
@@ -1990,7 +1998,7 @@ sub create_sources_list {
 }
 
 sub create_packages_list_db {
-    my ($ldap_handle, $sources_file) = @_ ;
+    my ($ldap_handle, $sources_file);
 
        if (not defined $ldap_handle) { 
                $ldap_handle= &get_ldap_handle();