change structure of xml answer in GosaPackages

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

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 04577f38e935f15be1c991176b3a876a69d65cb7..4efe5efeb8096ef382a8fac95246391fde8aec88 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -942,7 +942,6 @@ GetOptions("h|help" => \&usage,
 $SIG{CHLD} = 'IGNORE';
 
 # restart daemon log file
-#if(-e $log_file ) { unlink $log_file }
 daemon_log(" ", 1);
 daemon_log("$0 started!", 1);
 

diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm
index 255022e3d9262f09f3d39f16fd5bfa9e5576642e..70e998bfb4832919825e70317d350f8d592038ed 100644 (file)
--- a/gosa-si/modules/GosaPackages.pm
+++ b/gosa-si/modules/GosaPackages.pm
@@ -334,7 +334,7 @@ sub db_res_2_xml {
     my $xml = "<xml>";
 
     while ( my ($hit, $hash) = each %{ $db_res } ) {
-        $xml .= "<$hit>";
+        $xml .= "<answer$hit>";
 
         while ( my ($column_name, $column_value) = each %{$hash} ) {
             $xml .= "<$column_name>";
@@ -346,7 +346,7 @@ sub db_res_2_xml {
             $xml .= "</$column_name>"; 
         }
 
-        $xml .= "</$hit>";
+        $xml .= "</answer$hit>";
     }
 
     $xml .= "</xml>";
@@ -402,7 +402,7 @@ sub delete_jobdb_entry {
     }
 
     # prepare xml answer
-    my $out_xml = "<xml><1>$res</1></xml>";
+    my $out_xml = "<xml><answer1>$res</answer1></xml>";
     return $out_xml;
 
 }
@@ -424,7 +424,7 @@ sub clear_jobdb {
     }
 
     # prepare xml answer
-    my $out_xml = "<xml><1>$res</1></xml>";
+    my $out_xml = "<xml><answer1>$res</answer1></xml>";
     return $out_xml;
 }
 
@@ -441,7 +441,7 @@ sub update_status_jobdb_entry {
     }
 
     if( not exists $msg_hash->{update}[0]->{status} ) {
-        return "<xml><1>1</1></xml>";
+        return "<xml><answer1>1</answer1></xml>";
     }
     $update_hash->{update} = [ { status=>$msg_hash->{update}[0]->{status} } ];
 
@@ -457,7 +457,7 @@ sub update_status_jobdb_entry {
     }
 
     # prepare xml answer
-    my $out_xml = "<xml><1>$res</1></xml>";
+    my $out_xml = "<xml><answer1>$res</answer1></xml>";
     return $out_xml;
 }
 
@@ -474,7 +474,7 @@ sub update_timestamp_jobdb_entry {
     }
 
     if( not exists $msg_hash->{update}[0]->{timestamp} ) {
-        return "<xml><1>1</1></xml>";
+        return "<xml><answer1>1</answer1></xml>";
     }
 
     $update_hash->{update} = [ { timestamp=>$msg_hash->{update}[0]->{timestamp} } ];
@@ -491,7 +491,7 @@ sub update_timestamp_jobdb_entry {
     }
 
     # prepare xml answer
-    my $out_xml = "<xml><1>$res</1></xml>";
+    my $out_xml = "<xml><answer1>$res</answer1></xml>";
     return $out_xml;
 
 }