Changeset 84

Timestamp:

12/01/05 00:11:51 (19 years ago)

Author:

thauvin

Message:

• rename variable, use a more configurable structure to see if a file need to be read

Location:

trunk/soft/ObsData

Files:

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

trunk/soft/ObsData/ObsData.pm

@@ -68 +68 @@
         close($self->{loghandle});
         $self->{loghandle} = undef;
-    }
-}
-
-sub set_status {
-    my ($self, %settings) = @_;
-    my %status_default = (
-        archive_new => 1,
-        archive_time => 0,
-        archive_size => 0,
-
-        data_new => 1,
-        data_configmtime => 0,
-
-    );
-    
-    foreach (keys %status_default) {
-        $self->{status_make_work}{$_} = defined($settings{$_}) ? $settings{$_} : $status_default{$_};
     }
 }

trunk/soft/ObsData/ObsData/Repository.pm

@@ -12 +12 @@
 our $CVSID = q$Id$;
 our $CVSREV = (q$Revision$ =~ /^Revision: (.*) $/)[0];
+
+my %default_do_if_change = (
+    archive_new         => 1,
+    archive_time        => 0,
+    archive_size        => 0,
+    archive_configmtime => 0,
+
+    data_new            => 1,
+    data_configmtime    => 0,
+);
+
+sub default_do_if_change {
+    return %default_do_if_change;
+}
 
 =head1 METHODS
@@ -33 +47 @@
         ),
         dir => $dir,
+        do_if_change => {},
     };
     
@@ -65 +80 @@
 }
 
+sub set_do_if_change {
+    my ($self, %settings) = @_;
+    
+    foreach (keys %default_do_if_change) {
+        $self->{do_if_change}{$_} =
+            defined($settings{$_}) ? $settings{$_} : $default_do_if_change{$_};
+    }
+}
 
 sub parse_files {
@@ -106 +129 @@
 
     $ORa->{archivefile} = $archivefile;
-    
-    $ORa->{statusinfo} = {};
+    $ORa->{changes} = {};
     
     bless($ORa, $class);
@@ -118 +140 @@
 #}
 
-sub status {
+sub see_archive_change {
     my ($self) = @_;
 
@@ -124 +146 @@
 
     if ($self->{status}->SectionExists($self->{archivefile})) {
-    } else {
-        $self->{statusinfo}{archive_new} =
-            $self->loging(0, "%s is new files", $self->{archivefile});
-    }
-}
-
-# TODO Define return code for this function, storing result somewhere to
-# pass to child.
-sub file_need_parse {
-    my ($self) = @_;
-
-    my @filestats = stat("$self->{dir}/$self->{archivefile}");
-            
-    if ($self->{status}->SectionExists($self->{archivefile})) {
-        $self->loging(0, "File %s found in status, checking...", $self->{archivefile});
-        my ($mtimeok, $sizeok, $conftimeok) = (0, 0, 0);
-        my $olddatatype = $self->{status}->val($self->{archivefile}, 'datatype');
-        my $oldmtime = $self->{status}->val($self->{archivefile}, 'mtime');
-        my $oldsize = $self->{status}->val($self->{archivefile}, 'size');
-        my $oldconftime = $self->{status}->val($self->{archivefile}, 'configtime');
-        if ($oldmtime) {
+        if (my $oldmtime = $self->{status}->val($self->{archivefile}, 'mtime')) {
             if ($oldmtime == $filestats[9]) {
-                $mtimeok = 1;
+
             } elsif ($oldmtime > $filestats[9]) {
                 $self->loging(3, 
@@ -154 +156 @@
                 );
             } else {
-                # Nothing special to say, file is simply more recent    
-            }
-        }
-        if (defined($oldsize)) {
-            if ($oldsize == $filestats[7]) {
-                $sizeok = 1;
-            } else {
-                # Nothing to say, size differ
-            }
-        }
-       
-        # Comparing time of the conf with time of conf during last process
-        # if config has changed, maybe something better will happend
-        if (defined($oldconftime) && $self->{obsdata}->config_mtime <= $oldconftime) {
-            $conftimeok = 1;
-        }
-        
-        #if ($olddatatype) {
-        if (defined($oldmtime) && defined($oldsize)) {
-            if (! ($sizeok && $mtimeok)) {
-                $self->loging(3, "File %s allready processed but has changed:%s%s",
+                $self->{changes}{archive_time} = $self->loging(0, 
+                    "%s is more recent %d => %d",
                     $self->{archivefile},
-                    ($sizeok ? "" : sprintf(" size %d => %d", $oldsize, $filestats[7])),
-                    ($mtimeok ? "" : sprintf(" mtime %d => %d", $oldmtime, $filestats[9])),
+                    $oldmtime,
+                    $filestats[9],
                 );
-            } elsif (!$conftimeok) {
-                $self->loging(0, "config has changed since last process: %s vs %d, retrying it",
-                    $oldconftime || '(none)',
-                    $self->{obsdata}->config_mtime
+            }
+        }
+
+        if (defined(my $oldsize = $self->{status}->val($self->{archivefile}, 'size'))) {
+            if ($oldsize != $filestats[7]) {
+                $self->{changes}{archive_size} = $self->loging(0, 
+                    "%s size differ %d => %d",
+                    $self->{archivefile},
+                    $oldsize,
+                    $filestats[7],
                 );
-                return 1;
-            }
-            return 0;
-        } else {
-            if ($sizeok && $mtimeok) {
-                $self->loging(0, 
-                    "%s was not take into acount, no change skipping",
-                    $self->{archivefile}
+            }
+        }
+
+        if (defined(my $oldconftime = $self->{status}->val($self->{archivefile}, 'configtime'))) {
+            if ($self->{obsdata}->config_mtime > $oldconftime) {
+                $self->{changes}{archive_configmtime} = $self->loging(0, 
+                    "%s config has changed since last processing %d => %d",
+                    $self->{archivefile},
+                    $oldconftime,
+                    $self->{obsdata}->config_mtime,
                 );
-                return 0;
-            } else {
-                $self->loging(0, 
-                    "%s file has not been processed, but change, retrying",
-                    $self->{archivefile}
-                );
-                return 1;
-            }
-        }
-        
+            }
+        }
+            
     } else {
-        $self->loging(0, "%s is new files", $self->{archivefile});
-        $self->update_status;
-        return 1;
-    }
+        $self->{changes}{archive_new} =
+            $self->loging(0, "%s is new file", $self->{archivefile});
+    }
+}
+
+# TODO Define return code for this function, storing result somewhere to
+# pass to child.
+sub file_need_parse {
+    my ($self) = @_;
+
+    $self->see_archive_change;
+
+    my $need = 0;
+    foreach (keys %{$self->{changes}}) {
+        if (defined($self->{changes}{$_}) && $self->{do_if_change}{$_}) {
+            $self->loging(0, $self->{changes}{$_});
+            $need++;
+        }
+    }
+    
+    $need
 }