scape database and input name using CDATA

[webpac2] / run.pl

diff --git a/run.pl b/run.pl
index 89e6047..5560537 100755 (executable)
--- a/run.pl
+++ b/run.pl
@@ -383,7 +383,7 @@ foreach my $database ( sort keys %{ $config->databases } ) {
                        next;
                }
 
-               next if ($only_input && ($input_name !~ m#$only_input#i && $input->{type} !~ m#$only_input#i));
+               next if defined $only_input && $input_name !~ m#$only_input#i;
 
                my $type = lc($input->{type});
 
@@ -542,7 +542,10 @@ foreach my $database ( sort keys %{ $config->databases } ) {
                }
 
                my $rules = $parser->normalize_rules($database,$input_name);
-               $log->logwarn("no normalize rules for $database/$input_name", $input_db->input_module->can('normalize') ? " using normalize from input module" : '') unless $rules;
+               if ( ! $rules ) {
+                       $log->logwarn("no normalize rules for $database/$input_name", $input_db->input_module->can('normalize') ? " using normalize from input module" : '');
+                       next;
+               }
 
                $log->debug("parsed normalize rules:\n$rules");
 
@@ -620,7 +623,7 @@ foreach my $database ( sort keys %{ $config->databases } ) {
 
                        if ($rules) {
 
-                               my $ds = WebPAC::Normalize::data_structure(
+                               $ds = WebPAC::Normalize::data_structure(
                                        row => $row,
                                        rules => $rules,
                                        lookup => $lookup_hash,