Author: spadkins
Date: Fri May 12 12:51:58 2006
New Revision: 6290
Modified:
p5ee/trunk/App-Repository/lib/App/ValueDomain/Repository.pm
Log:
use default repository if not specified
Modified: p5ee/trunk/App-Repository/lib/App/ValueDomain/Repository.pm
==============================================================================
--- p5ee/trunk/App-Repository/lib/App/ValueDomain/Repository.pm (original)
+++ p5ee/trunk/App-Repository/lib/App/ValueDomain/Repository.pm Fri May 12
12:51:58 2006
@@ -62,8 +62,8 @@
=cut
sub _load {
+ &App::sub_entry if ($App::trace);
my ($self, $values_string) = @_;
- my ($rep);
my ($values, $labels, $needs_loading, $refresh_interval, $time);
my ($method, $args, $rows, $row);
@@ -78,24 +78,23 @@
# the values/labels (or it's time to refresh them by loading them again)
# then the values/labels indeed need loading
my $repository = $self->{repository};
- if (defined $repository && $repository ne "") { #
repository-based domain
- if (!defined $values || !defined $labels || # never
loaded them yet
- (!$values_string && $self->{values_string}) || # asking for the
whole domain, only subset loaded
- (defined $values_string && defined $self->{values_string} && #
asking for a different subset than is loaded
- $values_string ne $self->{values_string})) {
- $needs_loading = 1;
- }
- else {
- $refresh_interval = $self->{refresh_interval};
- if (defined $refresh_interval && $refresh_interval ne "" &&
$refresh_interval >= 0) {
- if ($refresh_interval == 0) {
+
+ if (!defined $values || !defined $labels || # never
loaded them yet
+ (!$values_string && $self->{values_string}) || # asking for the
whole domain, only subset loaded
+ (defined $values_string && defined $self->{values_string} && # asking
for a different subset than is loaded
+ $values_string ne $self->{values_string})) {
+ $needs_loading = 1;
+ }
+ else {
+ $refresh_interval = $self->{refresh_interval};
+ if (defined $refresh_interval && $refresh_interval ne "" &&
$refresh_interval >= 0) {
+ if ($refresh_interval == 0) {
+ $needs_loading = 1;
+ }
+ else {
+ if (time() >= $self->{time} + $refresh_interval) {
$needs_loading = 1;
}
- else {
- if (time() >= $self->{time} + $refresh_interval) {
- $needs_loading = 1;
- }
- }
}
}
}
@@ -174,6 +173,7 @@
else {
return($values,$labels);
}
+ &App::sub_exit() if ($App::trace);
}
=head1 ACKNOWLEDGEMENTS