Changeset 33841 in osm for applications/editors/josm/i18n/convpreset.pl

Timestamp:

2017-11-20T16:29:04+01:00 (7 years ago)

Author:

stoecker

Message:

fix recent parsing errors

File:

• applications/editors/josm/i18n/convpreset.pl (modified) (3 diffs)

applications/editors/josm/i18n/convpreset.pl

@@ -38 +38 @@
   $r .= " chunk $chunk" if $chunk;
   $r .= " group $group" if $group;
+  $r .= " combo $combo_type $combo_n" if $combo_type;
   $r .= " $_[0]" if $_[0];
   return $r ? "/* $r */ " : "";
@@ -48 +49 @@
   chomp($line);
   print "tr(\"---DUMMY-MARKER---\"); ";
-  if($line =~ /<item\s+name=(".*?")/)
+  if($line =~ /<item\s+name=(".*?")/ || $line =~ /<item.* name=(".*?")/)
   {
     my $val = fix($1);
@@ -173 +174 @@
     my $vctxi = ($line =~ /value_context=(".*?")/) ? $1 : $vctx;
     my $value = ($line =~ /value=(".*?")/) ? $1 : undef;
-    if($line =~ /display_value=(".*?")/)
+    if($line =~ /[^.]display_value=(".*?")/)
     {
       my $val = fix($1);
-      print infoblock("$combo_type $combo_n entry $value display value") . ($vctxi ? " trc($vctxi, $val);" : " tr($val);");
+      print infoblock("entry $value display value") . ($vctxi ? " trc($vctxi, $val);" : " tr($val);");
     }
     else
     {
       my $val = fix($value);
-      print infoblock("$combo_type $combo_n entry $value display value") . ($vctxi ? " trc($vctxi, $val);" : " tr($val);");
+      print infoblock("entry $value display value") . ($vctxi ? " trc($vctxi, $val);" : " tr($val);");
     }
     if($line =~ /short_description=(".*?")/)
     {
       my $val = fix($1);
-      print infoblock("$combo_type $combo_n entry $value short description") . "tr($val);";
+      print infoblock("entry $value short description") . "tr($val);";
     }
     print "\n";