Changeset 31439 for branches/eam_branches/ipp-20110404/ippToPsps/perl/pspsSchema2xml.pl

Timestamp:

May 5, 2011, 10:05:10 AM (15 years ago)

Author:

eugene

Message:

merging updates from trunk

File:

• branches/eam_branches/ipp-20110404/ippToPsps/perl/pspsSchema2xml.pl (modified) (3 diffs)

branches/eam_branches/ipp-20110404/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();