Changeset 2227 for trunk

Timestamp:

02/27/19 23:11:17 (5 years ago)

Author:

nanardon

Message:

Improve queryformat (like rpm macro: ? ?\!)

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Objects.pm (modified) (1 diff)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Objects.pm

@@ -310 +310 @@
     $fmt =~ s/\\n/\n/g;
     $fmt =~ s/\\t/\t/g;
-    $fmt =~ s!
-        (?:%\{([^:}]*)(?::([^}]+))?\})
-        !
-        my $val = $self->get_c_field($1);
-        sprintf('%' . ($2 || 's'), ref $val ? join(',', @$val) : (defined($val) ? $val : ''))
-        !egx;
+
+    my $old;
+    do {
+        $old = $fmt;
+        $fmt =~ s&(?:%\{([\?!]+)?([^:}%]*)(?::([^}%]*))?\})&
+            my $op = $1;
+            my $val = $self->get_c_field($2);
+            my $modifier = $3 || '';
+            my $res = '';
+
+            if (!$op) {
+                for ($modifier) {
+                    /upper/ and do {
+                        $res = uc($val);
+                        last;
+                    };
+                    /lower/ and do {
+                        $res = lc($val);
+                        last;
+                    };
+                    $res = sprintf('%' . ($3 || 's'), ref $val ? join(',', @$val) : (defined($val) ? $val : ''))
+                }
+            } elsif ($op eq '?') {
+                $res = $val ? $3 : '';
+            } elsif ($op eq '?!') {
+                $res = $val ? '' : $3;
+            }
+            $res
+        &egx;
+    } while($old ne $fmt);
     $fmt;
 }