Introduced remove_classes method to get rid of unused classes in queries
diff --git a/lib/Krawfish/Koral/Query/Constraint/ClassDistance.pm b/lib/Krawfish/Koral/Query/Constraint/ClassDistance.pm
index b07b729..c805674 100644
--- a/lib/Krawfish/Koral/Query/Constraint/ClassDistance.pm
+++ b/lib/Krawfish/Koral/Query/Constraint/ClassDistance.pm
@@ -7,18 +7,33 @@
sub new {
my $class = shift;
- my $nr = shift;
+ my $nr = shift // 1;
bless \$nr, $class;
};
+
sub to_string {
my $self = shift;
return 'class=' . $$self;
};
-sub plan_for {
+
+sub normalize {
+ $_[0];
+};
+
+
+sub optimize {
my $self = shift;
Krawfish::Query::Constraint::ClassDistance->new($$self);
};
+
+sub plan_for {
+ warn 'DEPRECATED';
+ my $self = shift;
+ Krawfish::Query::Constraint::ClassDistance->new($$self);
+};
+
+
1;
diff --git a/lib/Krawfish/Koral/Query/Constraint/NotBetween.pm b/lib/Krawfish/Koral/Query/Constraint/NotBetween.pm
index 26858c4..d46502d 100644
--- a/lib/Krawfish/Koral/Query/Constraint/NotBetween.pm
+++ b/lib/Krawfish/Koral/Query/Constraint/NotBetween.pm
@@ -25,7 +25,8 @@
return;
};
- # $query = $query->remove_classes;
+ # Remove all classes here, because they can't occur
+ $query = $query->remove_classes;
$self->{query} = $query;
$self;