Item1884: added missing require, and improved result checking

git-svn-id: http://svn.foswiki.org/trunk@4600 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Aug 5, 2009 · 6ecc03b · 6ecc03b
1 parent a4c2122
commit 6ecc03b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/core/lib/Foswiki/Query/Node.pm b/core/lib/Foswiki/Query/Node.pm
@@ -105,6 +105,7 @@ sub evaluate {
 
             # a name; look it up in $domain{data}
             eval "require $Foswiki::cfg{RCS}{QueryAlgorithm}";
+            die $@ if $@;
             $result = $Foswiki::cfg{RCS}{QueryAlgorithm}->getField(
                 $this, $domain{data}, $this->{params}[0] );
         }

diff --git a/core/lib/Foswiki/Query/OP_ref.pm b/core/lib/Foswiki/Query/OP_ref.pm
@@ -9,11 +9,12 @@
 package Foswiki::Query::OP_ref;
 
 use strict;
-use Error qw( :try );
-
 use Foswiki::Query::BinaryOP ();
 our @ISA = ('Foswiki::Query::BinaryOP');
 
+use Error qw( :try );
+use Assert;
+
 sub new {
     my $class = shift;
     return $class->SUPER::new( name => '/', prec => 700 );
@@ -24,6 +25,9 @@ sub evaluate {
     my $pnode  = shift;
     my %domain = @_;
 
+    eval "require $Foswiki::cfg{RCS}{QueryAlgorithm}";
+    die $@ if $@;
+
     my $a    = $pnode->{params}[0];
     my $node = $a->evaluate(@_);
     return unless defined $node;
@@ -40,7 +44,6 @@ sub evaluate {
         my ( $w, $t ) =
           $Foswiki::Plugins::SESSION->normalizeWebTopicName(
               $Foswiki::Plugins::SESSION->{webName}, $v );
-        my $result = undef;
         try {
             my $submeta = $Foswiki::cfg{RCS}{QueryAlgorithm}->getRefTopic(
                 $domain{tom}, $w, $t );
@@ -53,7 +56,9 @@ sub evaluate {
                 push( @result, $res );
             }
         }
-        catch Error::Simple with {};
+        catch Error::Simple with {
+            print STDERR "ERROR IN OP_ref: $_[0]->{-text}" if DEBUG;
+        };
     }
     return unless scalar(@result);
     return $result[0] if scalar(@result) == 1;