Changeset 28394

Timestamp:

Jun 17, 2010, 1:32:33 PM (16 years ago)

Author:

Paul Price

Message:

Merging fix to DataStore parsing required for MOPS' DataStore.

Location:

tags/ipp-20100616/DataStore

Files:

• . (modified) (1 prop)
• lib/DataStore/FileSet/Parser.pm (modified) (5 diffs)
• lib/DataStore/Product/Parser.pm (modified) (4 diffs)

tags/ipp-20100616/DataStore/lib/DataStore/FileSet/Parser.pm

@@ -100 +100 @@
 
     $p{base_uri} =~ qr|(.*?/)index.txt|;
-    $self->{base_uri} = $1; 
+    $self->{base_uri} = $1;
 
     return $self;
@@ -129 +129 @@
         {
             type    => SCALAR,
-            regex   => qr/\S+/, # string with at least 1 non WS char
         }
     );
@@ -139 +138 @@
         next LINE if $line =~ /^\s*$/;
 
-        # comment lines   
+        # comment lines
         next LINE if $line =~ /^\s*\#/;
 
@@ -183 +182 @@
             carp "line $lineno: type $type unknown: $line";
             next LINE;
-        } 
+        }
 
         my @extra = @fields[3 .. $#fields] if $#fields >= 3;
@@ -192 +191 @@
             datetime    => $datetime,
             type        => $type,
-            extra       => \@extra, 
+            extra       => \@extra,
             uri         => $self->base_uri . $fileset . '/index.txt',
         });

tags/ipp-20100616/DataStore/lib/DataStore/Product/Parser.pm

@@ -132 +132 @@
         {
             type    => SCALAR,
-            regex   => qr/\S+/, # string with at least 1 non WS char
         }
     );
@@ -142 +141 @@
         next LINE if $line =~ /^\s*$/;
 
-        # comment lines   
+        # comment lines
         next LINE if $line =~ /^\s*\#/;
 
@@ -159 +158 @@
                 next LINE;
             }
-        
+
             # strip leading and trailing whitespace
             $field =~ s/^\s+//;
@@ -184 +183 @@
             carp "line $lineno: type $type unknown: $line";
             next LINE;
-        } 
+        }
 
         # fifo