Changeset 57

Timestamp:

11/25/05 07:41:59 (19 years ago)

Author:

thauvin

Message:

• O::R die if O is undef
• more parsing code

Location:

trunk/soft/ObsData

Files:

• ObsData/Repository.pm (modified) (4 diffs, 1 prop)
• t/OR-01.t (modified) (1 diff, 1 prop)

trunk/soft/ObsData/ObsData/Repository.pm

@@ -19 +19 @@
     my ($class, $obsdata, $dir, %info) = @_;
 
-    
+    $obsdata or die "Error #1de8d015, please insult programmer";
+
     $dir && -d $dir or return undef;
-
-    $obsdata or return undef;
 
     my $OR = {
@@ -32 +31 @@
         dir => $dir,
     };
-
-
     
     foreach my $inf (qw(obs datatype)) {
@@ -65 +62 @@
 
 
+
 sub parse_files {
     my ($self) = @_;
+    $self->loging(0, "%s() start for %s", (caller(0))[3], $self->{dir});
     if(opendir(my $dirhandle, $self->{dir})) {
         while (my $file = readdir($dirhandle)) {
@@ -72 +71 @@
                 next;
             }
+
+            if ($self->{status}->SectionExists($file)) {
+            } else {
+                $self->loging(0, "%s is new files", $file);
+                $self->{status}->AddSection($file);
+            }
+
+            
+            my ($datatype, $destfile) = $self->{obsdata}->build_dest_filename($file, $self->{datatype});
+            $self->loging(0, "%s file, datatype %s, destination %s",
+                $file,
+                $datatype || '(none)',
+                $destfile || '(none)',
+            );
         }
         close($dirhandle);

trunk/soft/ObsData/t/OR-01.t

@@ -5 +5 @@
 use_ok('ObsData::Repository');
 
-ok(!ObsData::Repository->new(), "Return an error on bad file");
+ok(!ObsData::Repository->new(1), "Return an error on bad file");