From: rettenbe <rettenbe@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 11 Apr 2008 12:13:45 +0000 (+0000)
Subject: new column for jobs.db
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2c56a12a905a9f66562cb26d994142e99fbf2a8b;p=gosa.git

new column for jobs.db


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10356 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 5ee945afe..cb243deff 100755
--- 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
diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm
index 25127ad06..1141a1d59 100644
--- a/gosa-si/modules/GosaPackages.pm
+++ b/gosa-si/modules/GosaPackages.pm
@@ -324,6 +324,7 @@ sub process_job_msg {
 
     my $header = @{$msg_hash->{'header'}}[0];
     $header =~ s/job_//;
+	my $target = @{$msg_hash->{'target'}}[0];
     
     # if no timestamp is specified, use 19700101000000
     my $timestamp = "19700101000000";
@@ -348,12 +349,12 @@ sub process_job_msg {
             "</xml>";
     }
     
-	# if mac address is already known in ldap, set targettag to 'cn'
-    my $target;
+	# if mac address is already known in ldap, set plain_name to 'cn'
+    my $plain_name;
 	my $ldap_handle = &main::get_ldap_handle($session_id); 
 	if( not defined $ldap_handle ) {
 		&main::daemon_log("$session_id ERROR: cannot connect to ldap", 1);
-		$target = "none"; 
+		$plain_name = "none"; 
 		
 	# try to fetch a 'real name'		
 	} else {
@@ -364,10 +365,10 @@ sub process_job_msg {
 						filter => "(macAddress=$macaddress)");
 		if($mesg->code) {
 			&main::daemon_log($mesg->error, 1);
-			$target = "none";
+			$plain_name = "none";
 		} else {
 			my $entry= $mesg->entry(0);
-			$target = $entry->get_value("cn");
+			$plain_name = $entry->get_value("cn");
 		}
 	}
 
@@ -383,6 +384,7 @@ sub process_job_msg {
             targettag=>$target,
             xmlmessage=>$msg,
             macaddress=>$macaddress,
+			plainname=>$plain_name,
         };
 
         my $res = $main::job_db->add_dbentry($func_dic);