Changeset 88

Timestamp:

12/01/05 19:00:57 (19 years ago)

Author:

thauvin

Message:

• make function independent

Location:

trunk/soft/ObsData

Files:

• ObsData.pm (modified) (1 diff, 1 prop)
• ObsData/Repository.pm (modified) (11 diffs, 1 prop)

trunk/soft/ObsData/ObsData.pm

@@ -289 +289 @@
             next;
         }
-        $or->parse_files;
+        $or->process;
     }
 }

trunk/soft/ObsData/ObsData/Repository.pm

@@ -55 +55 @@
     
     bless($or, $class);
+
+    $or->set_do_if_change;
+    $or;
 }
 
@@ -129 +132 @@
 }
 
-sub parse_files {
+sub process {
     my ($self) = @_;
     $self->loging(0, "%s() start for %s", (caller(0))[3], $self->{dir});
@@ -138 +141 @@
             archivefile => $file,
         );
-        $orda->parse_archive;
+        $orda->process;
     }
 }
@@ -164 +167 @@
 #}
 
-sub see_archive_change {
-    my ($self) = @_;
-
-    my @filestats = stat("$self->{dir}/$self->{archivefile}");
+sub get_info {
+    my ($self) = @_;
+
+    $self->{filestats} = [ stat("$self->{dir}/$self->{archivefile}") ];
+
+    if (! @{$self->{filestats}}) {
+        $self->loging(4,
+            "Cannot get info of %s",
+            "$self->{dir}/$self->{archivefile}"
+        );
+        return 0;
+    }
 
     if ($self->{status}->SectionExists($self->{archivefile})) {
         if (my $oldmtime = $self->{status}->val($self->{archivefile}, 'mtime')) {
-            if ($oldmtime == $filestats[9]) {
-
-            } elsif ($oldmtime > $filestats[9]) {
+            if ($oldmtime == $self->{filestats}[9]) {
+
+            } elsif ($oldmtime > $self->{filestats}[9]) {
                 $self->loging(3, 
                     "Wahou, %s is older than my reference: %d => %d", 
                     $oldmtime,
-                    $filestats[9],
+                    $self->{filestats}[9],
                 );
             } else {
@@ -184 +195 @@
                     $self->{archivefile},
                     $oldmtime,
-                    $filestats[9],
+                    $self->{filestats}[9],
                 );
             }
@@ -190 +201 @@
 
         if (defined(my $oldsize = $self->{status}->val($self->{archivefile}, 'size'))) {
-            if ($oldsize != $filestats[7]) {
+            if ($oldsize != $self->{filestats}[7]) {
                 $self->{changes}{archive_size} = $self->loging(0, 
                     "%s size differ %d => %d",
                     $self->{archivefile},
                     $oldsize,
-                    $filestats[7],
+                    $self->{filestats}[7],
                 );
             }
@@ -210 +221 @@
             }
         }
-            
     } else {
         $self->{changes}{archive_new} =
             $self->loging(0, "%s is new file", $self->{archivefile});
     }
+    return 1;
 }
 
@@ -221 +232 @@
 sub file_need_parse {
     my ($self) = @_;
-
-    $self->see_archive_change;
 
     my $need = 0;
@@ -249 +258 @@
 sub parse_archive {
     my ($self) = @_;
-
-    my $newer = $self->file_need_parse();
 
     $self->loging(0, "trying to read archive content of %s", $self->{archivefile});
@@ -262 +269 @@
     };
 
-    $self->update_status;
     foreach my $datafile ($self->{Oarchive}->ls) {
         $self->loging(0, "archive %s: content %s", $self->{archivefile}, $datafile);
@@ -271 +277 @@
         $data->dispatch;
     }
+    return 1;
+}
+
+sub process {
+    my ($self) = @_;
+
+    if (!$self->get_info) {
+        return 0;
+    }
+
+    if ($self->file_need_parse) {
+        if (!$self->parse_archive) {
+            return 0;
+        }
+    }
+
+    $self->update_status;
+
+    return 1;
 }