ParseFilter: re-factor das Parsen von Filter- und Methodennamen

diff --git a/SL/Controller/Helper/ParseFilter.pm b/SL/Controller/Helper/ParseFilter.pm
index 243b0b63f5a50408d7b16bec2ac0a9e060cf3e0d..699011d01753bb8841f38ff944244206f76b7d29 100644 (file)
--- a/SL/Controller/Helper/ParseFilter.pm
+++ b/SL/Controller/Helper/ParseFilter.pm
@@ -99,22 +99,29 @@ sub _parse_filter {
 
   $flattened = _collapse_indirect_filters($flattened);
 
 
   $flattened = _collapse_indirect_filters($flattened);
 

+  my $all_filters = { %filters, %{ $params{filters} || {} } };
+  my $all_methods = { %methods, %{ $params{methods} || {} } };
+

   my @result;
   for (my $i = 0; $i < scalar @$flattened; $i += 2) {
   my @result;
   for (my $i = 0; $i < scalar @$flattened; $i += 2) {

+    my (@args, @filters, @methods);
+

     my ($key, $value) = ($flattened->[$i], $flattened->[$i+1]);
     my ($type, $op)   = $key =~ m{:(.+)::(.+)};
 
     my $is_multi      = $key =~ s/:multi//;
     my ($key, $value) = ($flattened->[$i], $flattened->[$i+1]);
     my ($type, $op)   = $key =~ m{:(.+)::(.+)};
 
     my $is_multi      = $key =~ s/:multi//;

-    my $orig_key      = $key;

     my @value_tokens  = $is_multi ? parse_line('\s+', 0, $value) : ($value);
 
     my @value_tokens  = $is_multi ? parse_line('\s+', 0, $value) : ($value);
 

-    my @args;
+    ($key, @methods)  = split m{::}, $key;
+    ($key, @filters)  = split m{:},  $key;
+
+    my $orig_key      = $key;

 
     for my $value_token (@value_tokens) {
       $key                 = $orig_key;
 
 
     for my $value_token (@value_tokens) {
       $key                 = $orig_key;
 

-      ($key, $value_token) = _apply_all($key, $value_token, qr/\b:(\w+)/,  { %filters, %{ $params{filters} || {} } });
-      ($key, $value_token) = _apply_all($key, $value_token, qr/\b::(\w+)/, { %methods, %{ $params{methods} || {} } });
+      $value_token         = _apply($value_token, $_, $all_filters) for @filters;
+      $value_token         = _apply($value_token, $_, $all_methods) for @methods;

       ($key, $value_token) = _dispatch_custom_filters($params{class}, $with_objects, $key, $value_token) if $params{class};
       ($key, $value_token) = _apply_value_filters($key, $value_token, $type, $op);
 
       ($key, $value_token) = _dispatch_custom_filters($params{class}, $with_objects, $key, $value_token) if $params{class};
       ($key, $value_token) = _apply_value_filters($key, $value_token, $type, $op);
 


@@ -239,16 +246,6 @@ sub _apply {
   return $filters->{$name}->($value);
 }
 
   return $filters->{$name}->($value);
 }
 

-sub _apply_all {
-  my ($key, $value, $re, $subs) = @_;
-
-  while ($key =~ s/$re//) {
-    $value = _apply($value, $1, $subs);
-  }
-
-  return $key, $value;
-}
-

 1;
 
 __END__
 1;
 
 __END__