Now parses as single string instead of separate lines

so arbitrary xml whitespace is handled.

diff --git a/gentext/locale/Auditlocale.pl b/gentext/locale/Auditlocale.pl
index 80a88f5a967487baa405728b1dd9d3a709867fbf..6de40f9b4dbd18fc668bdaeaa22ce623ca649cb1 100755 (executable)
--- a/gentext/locale/Auditlocale.pl
+++ b/gentext/locale/Auditlocale.pl
@@ -18,87 +18,106 @@ if ( scalar(@ARGV) < 1 ) {
     exit 0;
 }
 
+# Treat file as single line
+local $/;
+undef $/;
+
 open MASTER, "<en.xml";
 
-my $context;
+# slurp whole file into a variable
+my $master = <MASTER>;
+
+close MASTER;
+
 my %mastertemplate;
 my @mastergentext;
 my @masterdingbat;
 my @contexts;
-my %template;
 
-while(<MASTER>) {
-    if ( /<gentext\s+key="(.*?)"/ ) {
-       push @mastergentext, $1;
-    }
-    if ( /<dingbat\s+key="(.*?)"/ ) {
-       push @masterdingbat, $1;
+while ( $master =~ /<gentext\s+key="(.*?)"/gs ) {
+    push @mastergentext, $1;
+}
+
+while ( $master =~ /<dingbat\s+key="(.*?)"/gs ) {
+    push @masterdingbat, $1;
+}
+
+while ( $master =~ m|<context\s+name="(.*?)"\s*>(.*?)</context>|gs ) {
+    my $context = $1;
+    my $templates = $2;
+    push @contexts, $context;
+
+    while ( $templates =~ m|<template\s+name="(.*?)".*?>(.*?)</template>|gs ) {
+        $mastertemplate{$context}{$1} = $2;
     }
-    if ( /<context\s+name="(.*?)"/ ) {
-       $context = $1;
-       push @contexts, $context;
+}
+
+for $inputfile ( @ARGV ) {
+    local $/;
+    undef $/;
+    my @gentext;
+    my @dingbat;
+    my %template;
+    open INPUT, "<$inputfile";
+    my $input = <INPUT>;
+    close INPUT;
+
+    while( $input =~ /<gentext\s+key="(.*?)"/gs ) {
+        push @gentext, $1;
     }
-    if ( m|<template\s+name="(.*?)".*?>(.*?)</template>| ) {
-       $mastertemplate{$context}{$1} = $2;
+    while( $input =~ /<dingbat\s+key="(.*?)"/gs ) {
+        push @dingbat, $1;
     }
-}
 
-for $input ( @ARGV ) {
-    open INPUT, "<$input";
-    while(<INPUT>) {
-       if ( /<gentext\s+key="(.*?)"/ ) {
-               push @gentext, $1;
-       }
-       if ( /<dingbat\s+key="(.*?)"/ ) {
-               push @dingbat, $1;
-       }
-       if ( /<context\s+name="(.*?)"/ ) {
-               $context = $1;
-       }
-       if ( m|<template\s+name="(.*?)".*?>(.*?)</template>| ) {
-               $template{$context}{$1} = $2;
-       }
+    while ( $master =~ m|<context\s+name="(.*?)"\s*>(.*?)</context>|gs ) {
+        my $context = $1;
+        my $templates = $2;
+    
+        while ( $templates =~ m|<template\s+name="(.*?)".*?>(.*?)</template>|gs ) {
+            $template{$context}{$1} = $2;
+        }
     }
-    close INPUT;
+
+
 
     print "###########################################\n";
-    print "###   $input                               \n";
+    print "###   $inputfile                           \n";
     print "###########################################\n";
     # scan through master to see if missing in the other
     print "=========================== gentext \n";
     foreach my $name ( @mastergentext ) {
-       unless ( grep /^$name$/, @gentext ) {
-           print "Missing gentext $name\n";
-       }
+    unless ( grep /^$name$/, @gentext ) {
+        print "Missing gentext $name\n";
+    }
     }
     print "=========================== dingbat \n";
     foreach my $name ( @masterdingbat ) {
-       unless ( grep /^$name$/, @dingbat ) {
-           print "Missing dingbat $name\n";
-       }
+    unless ( grep /^$name$/, @dingbat ) {
+        print "Missing dingbat $name\n";
+    }
     }
     foreach my $context (@contexts) {
-       print "=========================== context $context \n";
-       foreach my $name ( keys %{ $mastertemplate{$context} } ) {
-           unless ( $template{$context}{$name} ) {
-               print "Missing template $name = $mastertemplate{$context}{$name}\n";
-           }
-       }
-       foreach my $name ( keys %{ $template{$context} } ) {
-           unless ( $mastertemplate{$context}{$name} ) {
-               print "Extra template not in master $name = $template{$context}{$name}\n";
-           }
-       }
+    print "=========================== context $context \n";
+    foreach my $name ( keys %{ $mastertemplate{$context} } ) {
+        unless ( $template{$context}{$name} ) {
+            print "Missing template $name = $mastertemplate{$context}{$name}\n";
+        }
+    }
+    foreach my $name ( keys %{ $template{$context} } ) {
+        unless ( $mastertemplate{$context}{$name} ) {
+            print "Extra template not in master $name = $template{$context}{$name}\n";
+        }
+    }
     }
     # scan through other to see if missing in master
     foreach my $name ( @gentext ) {
-       unless ( grep /^$name$/, @mastergentext ) {
-           print "Extra gentext not in master: $name\n";
-       }
+    unless ( grep /^$name$/, @mastergentext ) {
+        print "Extra gentext not in master: $name\n";
+    }
     }
     foreach my $name ( @dingbat ) {
-       unless ( grep /^$name$/, @masterdingbat ) {
-           print "Extra dingbat not in master: $name\n";
-       }
+    unless ( grep /^$name$/, @masterdingbat ) {
+        print "Extra dingbat not in master: $name\n";
+    }
     }
 }