small changes

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

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 81b36b20dddf9e587996b8c2e6bdf3dfbdf21321..37833524537e8f8fc6756738997871628a6257a1 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -475,12 +475,10 @@ sub get_processing_child {
                     my $answer;
                     my %act_modules = %$known_modules;
                     while( my ($module, $info) = each(%act_modules)) {
-                            &daemon_log("##########", 5);
                             my $tmp = &{ $module."::process_incoming_msg" }($msg);
                             if (defined $tmp) {
                                 $answer = $tmp;
                             }
-                            &daemon_log("##########", 5);
                     }        
 
                     #&print_known_daemons();
@@ -491,11 +489,11 @@ sub get_processing_child {
                    if (defined $answer) {
                         print $PARENT_wr $answer."\n";
                         my $len_answer = length $answer;
-                        daemon_log("with answer: length of answer: $len_answer", 5);
-                        daemon_log("$answer", 5);
+                        daemon_log("with answer: length of answer: $len_answer", 7);
+                        daemon_log("\n$answer", 7);
                     } else {
                         print $PARENT_wr "done"."\n";
-                        daemon_log(" ", 5);
+                        daemon_log(" ", 7);
                     }
                     redo;
                 }
@@ -1080,7 +1078,8 @@ while(1) {
             }
             chomp($in_msg);
 
-            daemon_log("process child read: $in_msg", 5);
+            daemon_log("process child read: $in_msg", 7);
+            daemon_log("\n$in_msg", 7);
             if (not defined $in_msg) { 
                 next; 
             } elsif ($in_msg =~ "done") {

diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm
index 2cc5b97022e8f3c14c6374035c510ccd00e818e5..b53919b5d93554f1884876cc28c148c6546e332d 100644 (file)
--- a/gosa-si/modules/GosaPackages.pm
+++ b/gosa-si/modules/GosaPackages.pm
@@ -338,6 +338,9 @@ sub process_incoming_msg {
         return;
 
     } else {
+
+        &main::daemon_log("antwort von query jobs db:", 1);
+        &main::daemon_log("$out_msg", 1);
         my $out_cipher = &create_ciphering($gosa_passwd);
         $out_msg = &encrypt_msg($out_msg, $out_cipher);
         return $out_msg;
@@ -429,13 +432,15 @@ sub db_res_2_xml {
     my $xml = "<xml>";
 
     while ( my ($hit, $hash) = each %{ $db_res } ) {
-        $xml .= "<answer$hit>";
+        $xml .= "\n<answer$hit>";
 
         while ( my ($column_name, $column_value) = each %{$hash} ) {
             $xml .= "<$column_name>";
-            my $xml_content = $column_value;
-            if( $column_name eq "xml" ) {
+            my $xml_content;
+            if( $column_name eq "xmlmessage" ) {
                 $xml_content = &encode_base64($column_value);
+            } else {
+                $xml_content = $column_value;
             }
             $xml .= $xml_content;
             $xml .= "</$column_name>";