Changeset 6499

Timestamp:

Feb 27, 2006, 12:32:00 PM (20 years ago)

Author:

jhoblitt

Message:

add DataStore::Record
rename DataStore::FileSet::Record -> DataStore::Record::FileSet
rename DataStore::File::Record -> DataStore::Record::File

Location:

trunk/DataStore/lib/DataStore

Files:

• File/Parser.pm (modified) (5 diffs)
• FileSet/Parser.pm (modified) (4 diffs)
• Record.pm (added)

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

@@ -1 +1 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: Parser.pm,v 1.4 2006-02-25 00:11:32 jhoblitt Exp $
+# $Id: Parser.pm,v 1.5 2006-02-27 22:32:00 jhoblitt Exp $
 
 package DataStore::File::Parser;
@@ -11 +11 @@
 $VERSION = '0.01';
 
+use base qw( Class::Accessor::Fast );
+
 use Carp qw( carp );
+use DataStore::Record;
 use Params::Validate qw( validate_pos SCALAR);
 
@@ -18 +21 @@
 my $md5_field = qr/^[0-9a-f]{32}$/;
 my %known_types = map { $_ => 1 } qw( chip );
+
+__PACKAGE__->mk_ro_accessors(qw(base_uri));
 
 =pod
@@ -136 +141 @@
 
         # fifo  
-        push @data, DataStore::File::Record->new({
+        push @data, DataStore::Record::File->new({
             fileid  => $fileid,
             bytes   => $bytes,
@@ -149 +154 @@
 }
 
-package DataStore::File::Record;
-
-use base qw( Class::Accessor::Fast );
-
-use vars qw( @BASE_FIELDS );
-
-@BASE_FIELDS = qw( fileid bytes md5sum type );
-
-__PACKAGE__->mk_accessors(@BASE_FIELDS);
-
 1;
 

trunk/DataStore/lib/DataStore/FileSet/Parser.pm

@@ -1 +1 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: Parser.pm,v 1.5 2006-02-25 04:48:25 jhoblitt Exp $
+# $Id: Parser.pm,v 1.6 2006-02-27 22:32:00 jhoblitt Exp $
 
 package DataStore::FileSet::Parser;
@@ -15 +15 @@
 use Carp qw( carp );
 use Data::Validate::URI qw( is_http_uri );
+use DataStore::Record;
 use Params::Validate qw( validate validate_pos SCALAR);
 
@@ -151 +152 @@
 
         # fifo
-        push @data, DataStore::FileSet::Record->new({
+        push @data, DataStore::Record::FileSet->new({
             fileset     => $fileset,
             datetime    => $datetime,
@@ -164 +165 @@
 }
 
-package DataStore::FileSet::Record;
-
-use base qw( Class::Accessor::Fast );
-
-use vars qw( @BASE_FIELDS );
-
-@BASE_FIELDS = qw( fileset datetime type uri );
-
-__PACKAGE__->mk_accessors(@BASE_FIELDS);
-
 1;