Changeset 3506 for trunk

Timestamp:

2002-10-29T17:23:42+13:00 (22 years ago)

Author:

jrm21

Message:

need to allow escaped \" inside a multiline "...". Eg

collectmetadata foo "

<a href=\"xyz\">link</a>
"

was not being correctly parsed.

File:

• trunk/gsdl/perllib/cfgread.pm (modified) (2 diffs)

trunk/gsdl/perllib/cfgread.pm

@@ -53 +53 @@
     $linecontinues = $line =~ s/\\$//;
 
-    while ($line =~ s/\s*(\"[^\"]*\"|\'[^\']*\'|\S+)\s*//) {
+    while ($line =~ s/\s*(\".*?[^\\]\"|\'.*?[^\\]\'|\S+)\s*//) {
         if (defined $1) {
         # remove any enclosing quotes
@@ -62 +62 @@
         $entry =~ s/\$(\w+)/$ENV{$1}/g;
         $entry =~ s/\$\{(\w+)\}/$ENV{$1}/g;
-
         push (@line, $entry);
         } else {