r998@llin: dpavlin | 2006-09-25 15:06:05 +0200

 first cuts at depends

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

diff --git a/lib/WebPAC/Parser.pm b/lib/WebPAC/Parser.pm
index d8fc8ea..96ea07b 100644 (file)
--- a/lib/WebPAC/Parser.pm
+++ b/lib/WebPAC/Parser.pm
@@ -229,13 +229,12 @@ sub parse_lookups {
                        $self->{_lookup_create}->{ _q($e[3]) }->{ _q($e[5]) }->{ _q($key) } .= $create;
 
 
-                       if (defined( $self->{depends}->{ $database }->{ $input }->{ _q($e[3]) }->{ _q($e[5]) } )) {
-                               my $dep_key = $self->{depends}->{ $database }->{ $input }->{ _q($e[3]) }->{ _q($e[5]) };
-                               $log->warn("dependency of $database/$input on $e[3]/$e[5] allready recorded as $dep_key, now changed to $key") if ($dep_key ne $key);
+                       if (defined( $self->{depends}->{ $database }->{ $input }->{ _q($e[3]) }->{ _q($e[5]) }->{ $key } )) {
+                               $log->warn("dependency of $database/$input on $e[3]/$e[5] with $key allready recorded");
                        }
 
                        # save this dependency
-                       $self->{depends}->{ $database }->{ $input }->{ _q($e[3]) }->{ _q($e[5]) } .= $key;
+                       $self->{depends}->{ $database }->{ $input }->{ _q($e[3]) }->{ _q($e[5]) }->{$key}++;
 
                        if ($#e < 10) {
                                $e[8]->insert_after( $e[8]->clone );

diff --git a/run.pl b/run.pl
index 4299b6e..ffcc3b2 100755 (executable)
--- a/run.pl
+++ b/run.pl
@@ -349,6 +349,11 @@ while (my ($database, $db_config) = each %{ $config->databases }) {
                );
                $log->logdie("can't create input using $input_module") unless ($input);
 
+               if (defined( $input->{lookup} )) {
+                       $log->warn("$database/", $input->{name}, " has depriciated lookup definition, removing it...");
+                       delete( $input->{lookup} );
+               }
+
                my $maxmfn = $input_db->open(
                        path => $input->{path},
                        code_page => $input->{encoding},        # database encoding