X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fgosa-si-server;h=1dd69157831df62552ae5277a4f56412f38b6b34;hb=7067bdf5cb4d4f7fc5a303c9005c183baeccff67;hp=c103cda3489c578ff98e441791ee2cccbd506662;hpb=1e5434986a2af80210c8d09efc130a044878f6da;p=gosa.git diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index c103cda34..1dd691578 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -1017,7 +1017,7 @@ while(1) { while( my ($id, $hit) = each %{$res} ) { - my $jobdb_id = $hit->{ROWID}; + my $jobdb_id = $hit->{id}; my $macaddress = $hit->{macaddress}; my $job_msg_hash = &transform_msg2hash($hit->{xmlmessage}); my $out_msg_hash = $job_msg_hash; @@ -1030,7 +1030,7 @@ while(1) { &daemon_log("xml message: $hit->{xmlmessage}", 5); my $update_hash = { table=>$job_queue_table_name, update=> [ { status=>['error'], result=>["no host found for mac address"] } ], - where=> [ { ROWID=>[$jobdb_id] } ], + where=> [ { id=>[$jobdb_id] } ], }; my $res = $job_db->update_dbentry($update_hash); @@ -1057,16 +1057,13 @@ while(1) { my $error = &send_msg_hash2address($out_msg_hash, "$gosa_ip:$gosa_port", $gosa_passwd); -####################### -# TODO exchange ROWID with jobid, insert column jobid in table jobs befor - if ($error == 0) { - my $sql = "UPDATE '$job_queue_table_name' SET status='processing', targettag='$target' WHERE ROWID='$jobdb_id'"; + my $sql = "UPDATE '$job_queue_table_name' SET status='processing', targettag='$target' WHERE id='$jobdb_id'"; my $res = $job_db->exec_statement($sql); } else { my $update_hash = { table=>$job_queue_table_name, update=> [ { status=>'error' } ], - where=> [ { ROWID=>$jobdb_id } ], + where=> [ { id=>$jobdb_id } ], }; my $res = $job_db->update_dbentry($update_hash); }