Changeset 73

Timestamp:

11/30/05 01:49:31 (19 years ago)

Author:

thauvin

Message:

• to see if file need to be recheck, take into account config file mtime

Location:

trunk/soft/ObsData

Files:

• ObsData/Repository.pm (modified) (8 diffs, 1 prop)
• bin/obsdata (modified) (2 diffs, 1 prop)

trunk/soft/ObsData/ObsData/Repository.pm

@@ -112 +112 @@
 #}
 
+# TODO Define return code for this function, storing result somewhere to
+# pass to child.
 sub file_need_parse {
     my ($self) = @_;
@@ -119 +121 @@
     if ($self->{status}->SectionExists($self->{archivefile})) {
         $self->loging(0, "File %s found in status, checking...", $self->{archivefile});
-        my ($mtimeok, $sizeok) = (0, 0);
+        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 ($oldmtime == $filestats[9]) {
@@ -143 +146 @@
             }
         }
+       
+        # Comparing time of the conf with time of conf during last process
+        # if config has changed, maybe something better will happend
+        my $configtime = (stat($self->{obsdata}->{config}->GetFileName))[9];
+        if (defined($oldconftime) && $configtime <= $oldconftime) {
+            $conftimeok = 1;
+        }
         
         #if ($olddatatype) {
@@ -152 +162 @@
                     ($mtimeok ? "" : sprintf(" mtime %d => %d", $oldmtime, $filestats[9])),
                 );
-            }
-        #    $self->loging(0, "%s has been allready processed: was %s", $file, $olddatatype);
+            } elsif (!$conftimeok) {
+                $self->loging(0, "config has changed since last process: %d vs %d, retrying it",
+                    $oldconftime,
+                    $configtime
+                );
+                return 1;
+            }
             return 0;
         } else {
@@ -174 +189 @@
         $self->loging(0, "%s is new files", $self->{archivefile});
         $self->{status}->AddSection($self->{archivefile});
-        $self->{status}->newval($self->{archivefile}, 'mtime', $filestats[9]);
-        $self->{status}->newval($self->{archivefile}, 'size', $filestats[7]);
+        $self->update_status;
         return 1;
     }
+}
+
+sub update_status {
+    my ($self) = @_;
+    my @filestats = stat("$self->{dir}/$self->{archivefile}");
+    
+    $self->{status}->newval($self->{archivefile}, 'mtime', $filestats[9]);
+    $self->{status}->newval($self->{archivefile}, 'size', $filestats[7]);
+
+    my $configtime = (stat($self->{obsdata}->{config}->GetFileName))[9];
+    $self->{status}->newval($self->{archivefile}, 'configtime', $configtime);
 }
 
@@ -194 +219 @@
         return;
     };
-    
+
+    $self->update_status;
     foreach my $datafile ($self->{Oarchive}->ls) {
         $self->loging(0, "archive %s: content %s", $self->{archivefile}, $datafile);
@@ -225 +251 @@
 #}
 
-sub dispatch {
-    my ($self) = @_;
-
+# TODO Define return code for this function, storing result somewhere to
+# pass to child.
+sub data_need_parse {
+    my ($self) = @_;
     my $last_process = $self->{status}->val($self->{archivefile}, "data_processtime_$self->{datafile}");
     if ($last_process) {
@@ -237 +264 @@
         return;
     }
+    return 1;
+}
+
+sub dispatch {
+    my ($self) = @_;
+
+    $self->data_need_parse or return;
     
     my ($datatype, $destfile) = $self->{obsdata}->build_dest_filename(

trunk/soft/ObsData/bin/obsdata

@@ -14 +14 @@
     'logfile=s' => \my $log,
     'i|init' => \my $init,
-    'debug' => \my $debug,
+    'debug' => sub { $verbose = 0 },
     'v' => sub { $verbose-- },
 );
@@ -21 +21 @@
     $configfile,
     logfile => $log,
-    verbose => $debug ? 0 : undef,
+    verbose => 0,
     logcallback => sub {
         return if($_[0] < $verbose);