Added DBsqlite to sed rewrite.

[gosa.git] / gosa-si / modules / GosaSupportDaemon.pm

diff --git a/gosa-si/modules/GosaSupportDaemon.pm b/gosa-si/modules/GosaSupportDaemon.pm
index 7a95901c2a7fc8e9480490e86c5290ec7c06feea..65bea486ad1499fab5cd1e2d101c9875cfef8028 100644 (file)
--- a/gosa-si/modules/GosaSupportDaemon.pm
+++ b/gosa-si/modules/GosaSupportDaemon.pm
@@ -10,6 +10,7 @@ my @functions = (
     "create_xml_string",
     "transform_msg2hash",
     "get_time",
+    "get_utc_time",
     "build_msg",
     "db_res2xml",
     "db_res2si_msg",
@@ -33,6 +34,7 @@ my @functions = (
     "inform_all_other_si_server",
     "read_configfile",
     "check_opsi_res",
+    "calc_timestamp",
     ); 
 @EXPORT = @functions;
 use strict;
@@ -44,6 +46,7 @@ use MIME::Base64;
 use XML::Simple;
 use Data::Dumper;
 use Net::DNS;
+use DateTime;
 
 
 my $op_hash = {
@@ -178,17 +181,23 @@ sub add_content2xml_hash {
 
 
 sub get_time {
-    my ($seconds, $minutes, $hours, $monthday, $month,
-            $year, $weekday, $yearday, $sommertime) = localtime(time);
-    $hours = $hours < 10 ? $hours = "0".$hours : $hours;
-    $minutes = $minutes < 10 ? $minutes = "0".$minutes : $minutes;
-    $seconds = $seconds < 10 ? $seconds = "0".$seconds : $seconds;
-    $month+=1;
-    $month = $month < 10 ? $month = "0".$month : $month;
-    $monthday = $monthday < 10 ? $monthday = "0".$monthday : $monthday;
-    $year+=1900;
-    return "$year$month$monthday$hours$minutes$seconds";
+       my ($seconds, $minutes, $hours, $monthday, $month,
+               $year, $weekday, $yearday, $sommertime) = localtime;
+       $hours = $hours < 10 ? $hours = "0".$hours : $hours;
+       $minutes = $minutes < 10 ? $minutes = "0".$minutes : $minutes;
+       $seconds = $seconds < 10 ? $seconds = "0".$seconds : $seconds;
+       $month+=1;
+       $month = $month < 10 ? $month = "0".$month : $month;
+       $monthday = $monthday < 10 ? $monthday = "0".$monthday : $monthday;
+       $year+=1900;
+       return "$year$month$monthday$hours$minutes$seconds";
+}
+
 
+sub get_utc_time {
+    my $utc_time = qx(date --utc +%Y%m%d%H%M%S);
+    $utc_time =~ s/\s$//;
+    return $utc_time;
 }
 
 
@@ -228,7 +237,7 @@ sub db_res2xml {
 
     my $len_db_res= keys %{$db_res};
     for( my $i= 1; $i<= $len_db_res; $i++ ) {
-        $xml .= "\n<answer>";
+        $xml .= "\n<answer$i>";
         my $hash= $db_res->{$i};
         while ( my ($column_name, $column_value) = each %{$hash} ) {
             $xml .= "<$column_name>";
@@ -236,12 +245,12 @@ sub db_res2xml {
             if( $column_name eq "xmlmessage" ) {
                 $xml_content = &encode_base64($column_value);
             } else {
-                $xml_content = $column_value;
+                $xml_content = defined $column_value ? $column_value : "";
             }
             $xml .= $xml_content;
             $xml .= "</$column_name>"; 
         }
-        $xml .= "</answer>";
+        $xml .= "</answer$i>";
 
     }
 
@@ -824,5 +833,33 @@ sub check_opsi_res {
     return 0;
 }
 
+sub calc_timestamp {
+    my ($timestamp, $operation, $value) = @_ ;
+    my $res_timestamp = 0;
+    
+    $value = int($value);
+    $timestamp = int($timestamp);
+    $timestamp =~ /(\d{4})(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)/;
+    my $dt = DateTime->new( year   => $1,
+            month  => $2,
+            day    => $3,
+            hour   => $4,
+            minute => $5,
+            second => $6,
+            );
+
+    if ($operation eq "plus" || $operation eq "+") {
+        $dt->add( seconds => $value);
+        $res_timestamp = $dt->ymd('').$dt->hms('');
+    }
+
+    if ($operation eq "minus" || $operation eq "-") {
+        $dt->subtract(seconds => $value);
+        $res_timestamp = $dt->ymd('').$dt->hms('');
+    }
+
+    return $res_timestamp;
+}
+
 
 1;