Changeset 31434 for branches/czw_branch/20110406/ippToPsps/perl/pspsSchema2xml.pl

Timestamp:

May 4, 2011, 3:20:38 PM (15 years ago)

Author:

watersc1

Message:

Merging trunk into this branch

Location:

branches/czw_branch/20110406

Files:

• . (modified) (1 prop)
• ippToPsps/perl/pspsSchema2xml.pl (modified) (3 diffs)

branches/czw_branch/20110406/ippToPsps/perl/pspsSchema2xml.pl

@@ -307 +307 @@
 
     # parse line
-    if ($line =~ m/\s*([a-zA-Z0-9()-\[\]]+)\s+(.*)\s*--\/(.*)/) {
+    if ($line =~ m/\s*([a-zA-Z0-9()-_\[\]]+)\s+(.*)\s*--\/(.*)/) {
 
         $name = $1;
@@ -320 +320 @@
     }
     # no comment case
-    elsif ($line =~ m/\s*([a-zA-Z0-9()-\[\]]+)\s+(.*)/) {
+    elsif ($line =~ m/\s*([a-zA-Z0-9()-_\[\]]+)\s+(.*)/) {
 
         $name = $1;
@@ -394 +394 @@
             "arraysize" => $arraySize,
             "datatype" => $votType);
+    $votWriter->dataElement('DESCRIPTION', $comment);
     $votWriter->endTag();