MT#13329 adapt rewrite rules to new upstream syntax

Change-Id: I8ee7590814936f4a57f2066212d58369b7690d3e

lib/NGCP/Panel/Controller/Rewrite.pm

@@ -263,6 +263,7 @@ sub rules_list :Chained('set_base') :PathPart('rules') :CaptureArgs(0) {
     $c->stash(rules_uri => $c->uri_for_action("/rewrite/rules_root", [$c->req->captures->[0]]));
 
     $c->stash(template => 'rewrite/rules_list.tt');
+    return;
 }
 
 sub rules_root :Chained('rules_list') :PathPart('') :Args(0) {
@@ -281,7 +282,7 @@ sub rules_root :Chained('rules_list') :PathPart('') :Args(0) {
             direction => $elem->direction,
             priority => { ($use_next ? '>' : '<') => $elem->priority },
         },{
-            order_by => {($use_next ? '-asc' : '-desc') => 'priority'}
+            order_by => {($use_next ? '-asc' : '-desc') => 'priority'},
         })->first;
         try {
             if ($swap_elem) {
@@ -341,7 +342,7 @@ sub rules_root :Chained('rules_list') :PathPart('') :Args(0) {
         my $mp = $row->match_pattern;
         my $rp = $row->replace_pattern;
         $mp =~ s/\$avp\(s\:(\w+)\)/\${$1}/g;
-        $mp =~ s/\$\(avp\(s\:(\w+)\)\[\*\]\)/\@{$1}/g;
+        $mp =~ s/\$\(avp\(s\:(\w+)\)\[\+\]\)/\@{$1}/g;
         $rp =~ s/\$avp\(s\:(\w+)\)/\${$1}/g;
         $row->match_pattern($mp);
         $row->replace_pattern($rp);
@@ -378,6 +379,7 @@ sub rules_base :Chained('rules_list') :PathPart('') :CaptureArgs(1) {
         NGCP::Panel::Utils::Navigation::back_or($c, $c->stash->{rules_uri});
     }
     $c->stash(rule_result => $res);
+    return;
 }
 
 sub rules_edit :Chained('rules_base') :PathPart('edit') {

lib/NGCP/Panel/Form/RewriteRule/Rule.pm

@@ -97,7 +97,7 @@ has_block 'actions' => (
 before 'update_model' => sub {
     my $self = shift;
     $self->value->{match_pattern} =~   s/\$\{(\w+)\}/\$avp(s:$1)/g;
-    $self->value->{match_pattern} =~   s/\@\{(\w+)\}/\$(avp(s:$1)[*])/g;
+    $self->value->{match_pattern} =~   s/\@\{(\w+)\}/\$(avp(s:$1)[+])/g;
     $self->value->{replace_pattern} =~ s/\$\{(\w+)\}/\$avp(s:$1)/g;
 };
 
@@ -105,7 +105,7 @@ sub inflate_match_pattern {
     my ($self, $value) = @_;
     
     $value =~ s/\$avp\(s\:(\w+)\)/\${$1}/g;
-    $value =~ s/\$\(avp\(s\:(\w+)\)\[\*\]\)/\@{$1}/g;
+    $value =~ s/\$\(avp\(s\:(\w+)\)\[\+\]\)/\@{$1}/g;
     return $value;
 }
 

lib/NGCP/Panel/Utils/Subscriber.pm

@@ -1169,7 +1169,7 @@ sub apply_rewrite {
         field => $field,
     }, {
         join => 'ruleset',
-        order_by => { -asc => 'priority' }
+        order_by => { -asc => 'priority' },
     });
     my $cache = {};
     foreach my $r($rule_rs->all) {
@@ -1221,7 +1221,7 @@ sub apply_rewrite {
                     foreach my $v(@{ $val }) {
                         my $tmporig = $orig;
                         $tmporig =~ s/\$avp\(s:calle(?:r|e)_$avp\)/$v/g;
-                        $tmporig =~ s/\$\(avp\(s:calle(?:r|e)_$avp\)\[\*\]\)/$v/g;
+                        $tmporig =~ s/\$\(avp\(s:calle(?:r|e)_$avp\)\[\+\]\)/$v/g;
                         push @{ $field }, $tmporig;
                     }
                 } else {