* gosa-si-server-nobus

[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 4f01dc8d19a451464581f1b15913ad8a8db3ba7d..4745c05ed044e058b4de476d02a3b3a827d38a72 100644 (file)
--- a/gosa-si/server/events/databases.pm
+++ b/gosa-si/server/events/databases.pm
@@ -69,8 +69,14 @@ sub query_db {
     my $res_hash = $db->select_dbentry($sql_statement);
     
     my $out_xml = &db_res2si_msg($res_hash, $header, $target, $source);
-    $out_xml =~ s/<\/xml>/<session_id>$session_id<\/session_id><\/xml>/;
+    #$out_xml =~ s/<\/xml>/<session_id>$session_id<\/session_id><\/xml>/;
+    my $forward_to_gosa = @{$msg_hash->{'forward_to_gosa'}}[0];
+    if (defined $forward_to_gosa) {
+        #&add_content2xml_hash($out_hash, "forward_to_gosa", $forward_to_gosa);
+        $out_xml =~s/<\/xml>/<forward_to_gosa>$forward_to_gosa<\/forward_to_gosa><\/xml>/;
+    }
     my @out_msg_l = ( $out_xml );
+
     return @out_msg_l;
 }
     
@@ -106,6 +112,12 @@ sub count_db {
 
     my $count = keys(%{$res_hash});
     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) {
+        #&add_content2xml_hash($out_hash, "forward_to_gosa", $forward_to_gosa);
+        $out_xml =~s/<\/xml>/<forward_to_gosa>$forward_to_gosa<\/forward_to_gosa><\/xml>/;
+    }
+
     my @out_msg_l = ( $out_xml );
     return @out_msg_l;
 }
@@ -119,7 +131,7 @@ sub delete_jobdb_entry {
     my $table= $main::job_queue_tn;
     my $where= &get_where_statement($msg, $msg_hash);
     my $sql_statement = "DELETE FROM $table $where";
-    
+       &main::daemon_log("$session_id DEBUG: $sql_statement",7);
     # execute db query
     my $db_res = $main::job_db->del_dbentry($sql_statement);
 
@@ -132,6 +144,12 @@ sub delete_jobdb_entry {
 
     # prepare xml answer
     my $out_xml = "<xml><header>answer</header><source>$target</source><target>$source</target><answer1>$res</answer1><session_id>$session_id</session_id></xml>";
+    my $forward_to_gosa = @{$msg_hash->{'forward_to_gosa'}}[0];
+    if (defined $forward_to_gosa) {
+        #&add_content2xml_hash($out_hash, "forward_to_gosa", $forward_to_gosa);
+        $out_xml =~s/<\/xml>/<forward_to_gosa>$forward_to_gosa<\/forward_to_gosa><\/xml>/;
+    }
+
     my @out_msg_l = ( $out_xml );
     return @out_msg_l;
 
@@ -155,6 +173,12 @@ sub clear_jobdb {
     if( $error == 0 ) {
         $out_xml = "<xml><header>answer</header><source>$target</source><target>$source</target><answer1>0</answer1><session_id>$session_id</session_id></xml>";
     }
+    my $forward_to_gosa = @{$msg_hash->{'forward_to_gosa'}}[0];
+    if (defined $forward_to_gosa) {
+        #&add_content2xml_hash($out_hash, "forward_to_gosa", $forward_to_gosa);
+        $out_xml =~s/<\/xml>/<forward_to_gosa>$forward_to_gosa<\/forward_to_gosa><\/xml>/;
+    }
+   
     my @out_msg_l = ( $out_xml );
     return @out_msg_l;
 }
@@ -201,6 +225,12 @@ sub update_status_jobdb_entry {
     }
     
     my $out_msg = sprintf("<xml><header>answer</header><source>%s</source><target>%s</target>%s<session_id>$session_id</session_id></xml>", $target, $source, $out_xml);
+    my $forward_to_gosa = @{$msg_hash->{'forward_to_gosa'}}[0];
+    if (defined $forward_to_gosa) {
+        #&add_content2xml_hash($out_hash, "forward_to_gosa", $forward_to_gosa);
+        $out_xml =~s/<\/xml>/<forward_to_gosa>$forward_to_gosa<\/forward_to_gosa><\/xml>/;
+    }
+     
     my @out_msg_l = ( $out_msg );
     return @out_msg_l;
 }