From ea974a5a5448c986c50f25a97e4b6b06efa2e299 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Tue, 16 Apr 2013 15:47:33 +0200 Subject: [PATCH] locales.pl: Endloses rekursives Scannen derselben Datei verhindern Conflicts: scripts/locales.pl --- scripts/locales.pl | 145 +++++++++++++++++++++++---------------------- 1 file changed, 74 insertions(+), 71 deletions(-) diff --git a/scripts/locales.pl b/scripts/locales.pl index b6665588a..8105abd9a 100755 --- a/scripts/locales.pl +++ b/scripts/locales.pl @@ -519,88 +519,91 @@ sub scanhtmlfile { my $file = shift; - if (!defined $cached{$file}) { - my %plugins = ( 'loaded' => { }, 'needed' => { } ); - - open(IN, $file) || die $file; + return if defined $cached{$file}; - my $copying = 0; - my $issubmit = 0; - my $text = ""; - while (my $line = ) { - chomp($line); + my %plugins = ( 'loaded' => { }, 'needed' => { } ); - while ($line =~ m/\[\%[^\w]*use[^\w]+(\w+)[^\w]*?\%\]/gi) { - $plugins{loaded}->{$1} = 1; - } + if (!open(IN, $file)) { + print "E: template file '$file' not found\n"; + return; + } - while ($line =~ m/\[\%[^\w]*(\w+)\.\w+\(/g) { - my $plugin = $1; - $plugins{needed}->{$plugin} = 1 if (first { $_ eq $plugin } qw(HTML LxERP JavaScript JSON L P)); - } + my $copying = 0; + my $issubmit = 0; + my $text = ""; + while (my $line = ) { + chomp($line); - $plugins{needed}->{T8} = 1 if $line =~ m/\[\%.*\|.*\$T8/; - - while ($line =~ m/(?: # Start von Variante 1: LxERP.t8('...'); ohne darumliegende [% ... %]-Tags - (LxERP\.t8)\( # LxERP.t8( ::Parameter $1:: - ([\'\"]) # Anfang des zu übersetzenden Strings ::Parameter $2:: - (.*?) # Der zu übersetzende String ::Parameter $3:: - (?>>$string<<<\n" if $debug; - substr $line, $LAST_MATCH_START[1], $LAST_MATCH_END[0] - $LAST_MATCH_START[0], ''; - - $string = unescape_template_string($string); - $cached{$file}{all}{$string} = 1; - $cached{$file}{html}{$string} = 1; - $cached{$file}{submit}{$string} = 1 if $PREMATCH =~ /$submitsearch/; - $plugins{needed}->{T8} = 1 if $module eq '$T8'; - $plugins{needed}->{LxERP} = 1 if $module eq 'LxERP.t8'; - } + while ($line =~ m/\[\%[^\w]*use[^\w]+(\w+)[^\w]*?\%\]/gi) { + $plugins{loaded}->{$1} = 1; + } - while ($line =~ m/\[\% # Template-Start-Tag - [\-~#]? # Whitespace-Unterdrückung - \s* # Optional beliebig viele Whitespace - (?: # Die erkannten Template-Direktiven - PROCESS - | - INCLUDE - ) - \s+ # Mindestens ein Whitespace - [\'\"]? # Anfang des Dateinamens - ([^\s]+) # Beliebig viele Nicht-Whitespaces -- Dateiname - \.html # Endung ".html", ansonsten kann es der Name eines Blocks sein - /ix) { - my $new_file_name = "$basedir/templates/webpages/$1.html"; - $cached{$file}{scanh}{$new_file_name} = 1; - substr $line, $LAST_MATCH_START[1], $LAST_MATCH_END[0] - $LAST_MATCH_START[0], ''; - } + while ($line =~ m/\[\%[^\w]*(\w+)\.\w+\(/g) { + my $plugin = $1; + $plugins{needed}->{$plugin} = 1 if (first { $_ eq $plugin } qw(HTML LxERP JavaScript JSON L P)); } - close(IN); + $plugins{needed}->{T8} = 1 if $line =~ m/\[\%.*\|.*\$T8/; + + while ($line =~ m/(?: # Start von Variante 1: LxERP.t8('...'); ohne darumliegende [% ... %]-Tags + (LxERP\.t8)\( # LxERP.t8( ::Parameter $1:: + ([\'\"]) # Anfang des zu übersetzenden Strings ::Parameter $2:: + (.*?) # Der zu übersetzende String ::Parameter $3:: + (?>>$string<<<\n" if $debug; + substr $line, $LAST_MATCH_START[1], $LAST_MATCH_END[0] - $LAST_MATCH_START[0], ''; + + $string = unescape_template_string($string); + $cached{$file}{all}{$string} = 1; + $cached{$file}{html}{$string} = 1; + $cached{$file}{submit}{$string} = 1 if $PREMATCH =~ /$submitsearch/; + $plugins{needed}->{T8} = 1 if $module eq '$T8'; + $plugins{needed}->{LxERP} = 1 if $module eq 'LxERP.t8'; + } - foreach my $plugin (keys %{ $plugins{needed} }) { - next if ($plugins{loaded}->{$plugin}); - print "E: " . strip_base($file) . " requires the Template plugin '$plugin', but is not loaded with '[\% USE $plugin \%]'.\n"; + while ($line =~ m/\[\% # Template-Start-Tag + [\-~#]? # Whitespace-Unterdrückung + \s* # Optional beliebig viele Whitespace + (?: # Die erkannten Template-Direktiven + PROCESS + | + INCLUDE + ) + \s+ # Mindestens ein Whitespace + [\'\"]? # Anfang des Dateinamens + ([^\s]+) # Beliebig viele Nicht-Whitespaces -- Dateiname + \.html # Endung ".html", ansonsten kann es der Name eines Blocks sein + /ix) { + my $new_file_name = "$basedir/templates/webpages/$1.html"; + $cached{$file}{scanh}{$new_file_name} = 1; + substr $line, $LAST_MATCH_START[1], $LAST_MATCH_END[0] - $LAST_MATCH_START[0], ''; } } + close(IN); + + foreach my $plugin (keys %{ $plugins{needed} }) { + next if ($plugins{loaded}->{$plugin}); + print "E: " . strip_base($file) . " requires the Template plugin '$plugin', but is not loaded with '[\% USE $plugin \%]'.\n"; + } + # copy back into global arrays $alllocales{$_} = 1 for keys %{$cached{$file}{all}}; $locale{$_} = 1 for keys %{$cached{$file}{html}}; -- 2.20.1