rewrite proposal for new lookups

git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@680 07558da8-63fa-0310-ba24-9fe276d99e06

diff --git a/conf/lookup/ffkk-arti.pl b/conf/lookup/ffkk-arti.pl
index 53fec27..72ac8db 100644 (file)
--- a/conf/lookup/ffkk-arti.pl
+++ b/conf/lookup/ffkk-arti.pl
@@ -1,33 +1,19 @@
-use Data::Dump qw/dump/;
-
-sub marc {};
-
-sub lookup {
-       my ( $db, $input, $from, $op, $to, $closure ) = @_;
-
-       print dump(@_),$/;
-}
 
 marc('777','v',
-
        lookup(
-               'ffkk','peri',  [ '11' ],               'eq',
-                               [ '11' ],
-               sub {
-                       'ffkk/perl' . lrec('000')
-               }
-       ) || lookup(
-               'ffkk','peri',  [ qw/200 a 200 e/ ],    'eq',
-                               [ qw/200 a 200 e/ ],
-               sub {
-                       'ffkk/perl' . lrec('000')
-               }
-       ) || lookup(
-               'ffkk','peri',  [ qw/200 a/ ],          'eq',
-                               [ qw/200 a/ ],
-               sub {
-                       'ffkk/perl' . lrec('000')
-               }
+               sub { 'ffkk/perl' . rec('000') },
+               'ffkk','peri',
+               sub { rec('11') },
+               sub { rec('11') },
+       ) ||
+       lookup(
+               sub { 'ffkk/perl' . rec('000') },
+               'ffkk','peri',
+               sub { rec('200','a') . rec('200','e') },
+       ) ||
+       lookup(
+               sub { 'ffkk/perl' . rec('000') },
+               'ffkk','peri',
+               sub { rec('200','a') },
        )
-
 );