Changeset 8722 for trunk/DataStore/lib/DataStore/File.pm

Timestamp:

Aug 31, 2006, 12:58:34 PM (20 years ago)

Author:

jhoblitt

Message:

allow upper & lower case characters in DataStore fields
change from lower to upper case all fileset types

File:

• trunk/DataStore/lib/DataStore/File.pm (modified) (4 diffs)

trunk/DataStore/lib/DataStore/File.pm

@@ -1 +1 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: File.pm,v 1.13 2006-07-22 01:17:33 smalle Exp $
+# $Id: File.pm,v 1.14 2006-08-31 22:58:34 jhoblitt Exp $
 
 package DataStore::File;
@@ -9 +9 @@
 
 use vars qw($VERSION);
-$VERSION = '0.02';
+$VERSION = '0.03';
 
 use base qw( DataStore::Record );
@@ -229 +229 @@
     my $ua = LWP::UserAgent->new;
     my $request = HTTP::Request->new(GET => $self->uri);
-    my $response = $ua->request($request, $p{filename});
+    my $filename = $p{filename};
+    my $response = $ua->request($request, $filename);
 
     if ($response->is_success) {
         # check size
         if (defined $self->bytes) {
-            my $size = stat($p{filename})->size;
+            my $size = stat($filename)->size;
             if (! $self->bytes == $size) {
-                unlink $p{filename};
+                unlink $filename;
                 carp "uri: ", $self->uri,
                      " - expected size: ", $self->bytes,
                      " got: ", $size;
-                return;
+                # set the filename to undef to indicate an error
+                $filename = undef;
+                last;
             }
         }
 
         if (defined $self->md5sum) {
-            my $md5 = file_md5_hex($p{filename});
+            my $md5 = file_md5_hex($filename);
             if (! $self->md5sum eq $md5) {
-                unlink $p{filename};
+                unlink $filename;
                 carp "uri: ", $self->uri,
                      " - expected md5: ", $self->md5sum,
                      " got: ", $md5;
-                return;
+                # set the filename to undef to indicate an error
+                $filename = undef;
+                last;
             }
         }
@@ -261 +266 @@
         code        => $response->code,
         status_line => $response->status_line,
-        data        => $p{filename},
+        data        => $filename,
         request     => $self,
     );