Fixed a compatibility problem between WRE and new Spectre code.

This commit is contained in:
JT Smith 2009-11-04 00:39:27 -06:00
parent 5ef8252ca9
commit 33f038359e
2 changed files with 14 additions and 10 deletions

View file

@ -1,4 +1,5 @@
7.8.4
- Fixed a compatibility problem between WRE and new Spectre code.
7.8.3
- Rewrote Spectre's workflow queues to prevent it from "forgetting" about some workflows.

View file

@ -294,18 +294,21 @@ sub getJsonStatus {
);
my %output;
if ($sitename) { #must have entry for each queue
$output{$sitename} = \%queues;
}
foreach my $instance ($self->getInstances) {
my $site = $instance->{sitename};
unless (exists $output{$site}) { # must have an entry for each queue in each site
$output{$site} = \%queues;
%output = %queues;
foreach my $instance ($self->getInstances) {
my $queue = ucfirst($instance->{status});
push @{$output{$queue}}, [$instance->{workingPriority}, $instance->{instanceId}, $instance];
}
my $queue = ucfirst($instance->{status});
push @{$output{$site}{$queue}}, [$instance->{workingPriority}, $instance->{instanceId}, $instance];
}
if ($sitename) { # single sitename option
%output = %{$output{$sitename}};
else {
foreach my $instance ($self->getInstances) {
my $site = $instance->{sitename};
unless (exists $output{$site}) { # must have an entry for each queue in each site
$output{$site} = \%queues;
}
my $queue = ucfirst($instance->{status});
push @{$output{$site}{$queue}}, $instance;
}
}
$kernel->call(IKC=>post=>$rsvp, encode_json(\%output));
}