Changeset 2233 for trunk/LATMOS-Accounts

Timestamp:

03/08/19 08:51:30 (5 years ago)

Author:

nanardon

Message:

Factorize search functions code

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases.pm (modified) (2 diffs)
• Bases/Sql.pm (modified) (1 diff)
• Bases/Sql/objects.pm (modified) (1 diff)

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

@@ -8 +8 @@
 use LATMOS::Accounts::Log;
 use LATMOS::Accounts::Utils qw( exec_command to_ascii );
+use DateTime;
 
 our $VERSION = (q$Rev: 2156 $ =~ /^Rev: (\d+) /)[0];
@@ -1243 +1244 @@
 }
 
+=head2 QFunc( $sub, @args )
+
+Compute function given in queryformat/search
+
+=cut
+
+sub QFunc {
+    my ($self, $sub, @args) = @_;
+
+    for ($sub) {
+        /^now$/ and return DateTime->now->iso8601;
+    }
+
+    return '';
+}
+
 1;
 

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

@@ -1184 +1184 @@
 }
 
+sub QFunc {
+    my ($self, $sub, @args) = @_;
+
+    $self->SUPER::QFunc($sub, @args);
+}
+
 
 1;

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm

@@ -1016 +1016 @@
             my @args = split(',', $args);
 
-            my %funcs = (
-                'now' => sub { DateTime->now->iso8601 },
-            );
-
-            if (my $sub = $funcs{ $func }) {
-                $val = $sub->( @args );
-            }
+            $val = $base->QFunc( $func, @args );
         }