Changeset 6487

Timestamp:

Feb 24, 2006, 2:09:28 PM (20 years ago)

Author:

jhoblitt

Message:

complete first pass implimentation of DataStore::File::Parser

Location:

trunk/DataStore

Files:

• MANIFEST (modified) (1 diff)
• lib/DataStore/File/Parser.pm (modified) (6 diffs)
• t/03_file_parse.t (added)

trunk/DataStore/MANIFEST

@@ -10 +10 @@
 t/00_distribution.t
 t/01_load.t
+t/03_file_parse.t

trunk/DataStore/lib/DataStore/File/Parser.pm

@@ -1 +1 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: Parser.pm,v 1.2 2006-02-24 03:19:28 jhoblitt Exp $
+# $Id: Parser.pm,v 1.3 2006-02-25 00:09:10 jhoblitt Exp $
 
 package DataStore::File::Parser;
@@ -15 +15 @@
 
 my $std_field = qr/^[a-z0-9-_.]+$/;
+my $byte_field = qr/^\d+$/;
+my $md5_field = qr/^[0-9a-f]{32}$/;
 my %known_types = map { $_ => 1 } qw( chip );
 
@@ -100 +102 @@
         }
 
-        # fields are not allowed to contain #
+        # fields are not allowed to contain \#
         foreach my $field (@fields) {
             if ($field =~ /\#/) {
@@ -110 +112 @@
         my ($fileid, $bytes, $md5sum, $type) = @fields;
 
-        # validate format of filed and type
+        # validate format of fileid and type
         foreach my $field ($fileid, $type) {
             unless ($field =~ $std_field) {
@@ -120 +122 @@
 
         # validate format of bytes
+        unless ($bytes =~ $byte_field) {
+            carp "line $lineno: field $bytes:"
+               . " does not conform to $byte_field: $line";
+            next LINE;
+        }
 
-        # validate format of md5sum
-#        unless ($datetime =~ $time_field) {
-#            carp "line $lineno: field $datetime:"
-#               . " does not conform to $time_field";
-#            next LINE;
-#        }
-#
-#        unless (exists $known_types{$type}) {
-#            carp "line $lineno: type $type unknown: $line";
-#            next LINE;
-#        } 
-#
-        unshift @data, DataStore::File::Record->new({
+        # validate format of md5sum, hex encoded
+        unless ($md5sum =~ $md5_field) {
+            carp "line $lineno: field $md5sum:"
+               . " does not conform to $md5_field: $line";
+            next LINE;
+        }
+
+        # lifo  
+        push @data, DataStore::File::Record->new({
             fileid  => $fileid,
             bytes   => $bytes,
@@ -152 +155 @@
 use vars qw( @BASE_FIELDS );
 
-@BASE_FIELDS = qw( filed bytes md5sum type );
+@BASE_FIELDS = qw( fileid bytes md5sum type );
+
+__PACKAGE__->mk_accessors(@BASE_FIELDS);
 
 1;