Remove unnessessarry utf8 usage

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

diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm
index 7e5eb63f5010a9921325181ea91f7581236fa37c..18879d691480d3e77f58dab54e3a148c4750b14b 100644 (file)
--- a/gosa-si/modules/GosaPackages.pm
+++ b/gosa-si/modules/GosaPackages.pm
@@ -13,6 +13,7 @@ use File::Spec;
 use Data::Dumper;
 use GOSA::DBsqlite;
 use MIME::Base64;
+use utf8;
 
 my $event_dir = "/usr/lib/gosa-si/server/events";
 use lib "/usr/lib/gosa-si/server/events";
@@ -229,12 +230,13 @@ sub import_events {
 
     while (defined (my $event = readdir (DIR))) {
         if( $event eq "." || $event eq ".." ) { next; }   
-        if( $event eq "siTriggered.pm" ) { next; }      # only SI specific events
+        if( $event eq "siTriggered.pm" ) { next; }      # SI specific events not needed in GosaPackages.pm
+        if( $event eq "clMessages.pm" ) { next; }                    # SI specific events not needed in GosaPackages.pm
 
         eval{ require $event; };
         if( $@ ) {
-            &main::daemon_log("import of event module '$event' failed", 1);
-            &main::daemon_log("$@", 8);
+            &main::daemon_log("ERROR: import of event module '$event' failed", 1);
+            &main::daemon_log("$@", 1);
             next;
         }
 
@@ -262,7 +264,7 @@ sub process_incoming_msg {
     my @msg_l;
     my @out_msg_l;
 
-    &main::daemon_log("GosaPackages: receive '$header'", 1);
+    &main::daemon_log("DEBUG: GosaPackages: receive '$header'", 8);
     
     if ($header =~ /^job_/) {
         @msg_l = &process_job_msg($msg, $msg_hash, $session_id);
@@ -271,7 +273,7 @@ sub process_incoming_msg {
         @msg_l = &process_gosa_msg($msg, $msg_hash, $session_id);
     } 
     else {
-        &main::daemon_log("ERROR: $header is not a valid GosaPackage-header, need a 'job_' or a 'gosa_' prefix");
+        &main::daemon_log("ERROR: $header is not a valid GosaPackage-header, need a 'job_' or a 'gosa_' prefix", 1);
     }
 
     foreach my $out_msg ( @msg_l ) {
@@ -378,6 +380,7 @@ sub process_job_msg {
             timestamp=>$timestamp,
             status=>'waiting', 
             result=>'none',
+            progress=>'none',
             headertag=>$header, 
             targettag=>$target,
             xmlmessage=>$msg,
@@ -398,43 +401,18 @@ sub process_job_msg {
 }
 
 
-sub db_res_2_xml {
-    my ($db_res) = @_ ;
-    my $xml = "<xml><header>answer</header><source>$server_address</source><target>GOSA</target>";
-
-    my $len_db_res= keys %{$db_res};
-    for( my $i= 1; $i<= $len_db_res; $i++ ) {
-        $xml .= "\n<answer$i>";
-        my $hash= $db_res->{$i};
-        while ( my ($column_name, $column_value) = each %{$hash} ) {
-            $xml .= "<$column_name>";
-            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>"; 
-        }
-        $xml .= "</answer$i>";
-
-    }
-
-    $xml .= "</xml>";
-    return $xml;
-}
-
 
 ## CORE FUNCTIONS ############################################################
 
 sub query_jobdb {
     my ($msg) = @_;
     my $msg_hash = &transform_msg2hash($msg);
+    my $target = @{$msg_hash->{'target'}}[0];
+    my $source = @{$msg_hash->{'source'}}[0];
 
     # prepare query sql statement
     my $select= &get_select_statement($msg, $msg_hash);
-    my $table= $main::job_queue_table_name;
+    my $table= $main::job_queue_tn;
     my $where= &get_where_statement($msg, $msg_hash);
     my $limit= &get_limit_statement($msg, $msg_hash);
     my $orderby= &get_orderby_statement($msg, $msg_hash);
@@ -442,7 +420,8 @@ sub query_jobdb {
 
     # execute db query   
     my $res_hash = $main::job_db->select_dbentry($sql_statement);
-    my $out_xml = &db_res_2_xml($res_hash);
+    my $out_xml = &db_res2si_msg($res_hash, "query_jobdb", $target, $source);
+
     my @out_msg_l = ( $out_xml );
     return @out_msg_l;
 }
@@ -530,23 +509,29 @@ sub update_status_jobdb_entry {
 
         # conditions
         # no timestamp update if status eq waiting
-        
+        my $res_hash = $main::job_db->select_dbentry("SELECT * FROM $table $where AND status='processing' ");
+        if( (0 != keys(%$res_hash)) && ($update =~ /timestamp/i) ) {
+            $error ++;
+            $out_xml = "<answer1>1</answer1><error_string>there is no timestamp update allowed while status is 'processing'</error_string>";
+        }
 
-        my $sql_statement = "UPDATE $table $update $where";
-        # execute db query
-        my $db_res = $main::job_db->update_dbentry($sql_statement);
+        if( $error == 0 ) {
+            my $sql_statement = "UPDATE $table $update $where";
+            # execute db query
+            my $db_res = $main::job_db->update_dbentry($sql_statement);
 
-        # check success of db update
-        if( not $db_res > 0 ) { $error++; };
+            # check success of db update
+            if( not $db_res > 0 ) { $error++; };
+
+        }
     }
 
     if( $error == 0) {
-        $out_xml = "<xml><header>answer</header><source>$server_address</source><target>GOSA</target><answer1>0</answer1></xml>";
+        $out_xml = "<answer1>0</answer1>";
     }
-    my @out_msg_l = ( $out_xml );
-
-print STDERR $out_xml."\n";
-
+    
+    my $out_msg = sprintf("<xml><header>answer</header><source>%s</source><target>GOSA</target>%s</xml>", $server_address, $out_xml);
+    my @out_msg_l = ( $out_msg );
     return @out_msg_l;
 }