Changeset 67

Timestamp:

11/29/05 01:39:36 (19 years ago)

Author:

thauvin

Message:

• rename variable to be coherent with new code

File:

• trunk/soft/ObsData/ObsData/Repository.pm (modified) (15 diffs, 1 prop)

trunk/soft/ObsData/ObsData/Repository.pm

@@ -91 +91 @@
 }
 
-sub install_file {
-    my ($self, $file) = @_;
-    
-}
-
 package ObsData::Repository::archive;
 
@@ -101 +96 @@
 
 sub new {
-    my ($class, $or, $archive) = @_;
-    
-    my $newor = { %$or };
-
-    $newor->{archive} = $archive;
-    
-    bless($newor, $class);
+    my ($class, $parent, $archivefile) = @_;
+    
+    my $ORa = { %$parent };
+
+    $ORa->{archivefile} = $archivefile;
+    
+    bless($ORa, $class);
 }
 
@@ -119 +114 @@
     my ($self) = @_;
 
-    my $file = $self->{archive}; # quick compatibility
-
-    my @filestats = stat("$self->{dir}/$file");
+    my @filestats = stat("$self->{dir}/$self->{archivefile}");
             
-    if ($self->{status}->SectionExists($file)) {
-        $self->loging(0, "File %s found in status, checking...", $file);
+    if ($self->{status}->SectionExists($self->{archivefile})) {
+        $self->loging(0, "File %s found in status, checking...", $self->{archivefile});
         my ($mtimeok, $sizeok) = (0, 0);
-        my $olddatatype = $self->{status}->val($file, 'datatype');
-        my $oldmtime = $self->{status}->val($file, 'mtime');
-        my $oldsize = $self->{status}->val($file, 'size');
+        my $olddatatype = $self->{status}->val($self->{archivefile}, 'datatype');
+        my $oldmtime = $self->{status}->val($self->{archivefile}, 'mtime');
+        my $oldsize = $self->{status}->val($self->{archivefile}, 'size');
         if ($oldmtime) {
             if ($oldmtime == $filestats[9]) {
@@ -154 +147 @@
             if (! ($sizeok && $mtimeok)) {
                 $self->loging(3, "File %s allready processed but has changed:%s%s",
-                    $file,
+                    $self->{archivefile},
                     ($sizeok ? "" : sprintf(" size %d => %d", $oldsize, $filestats[7])),
                     ($mtimeok ? "" : sprintf(" mtime %d => %d", $oldmtime, $filestats[9])),
@@ -163 +156 @@
         } else {
             if ($sizeok && $mtimeok) {
-                $self->loging(0, "%s was not take into acount, no change skipping", $file);
+                $self->loging(0, 
+                    "%s was not take into acount, no change skipping",
+                    $self->{archivefile}
+                );
                 return 0;
             } else {
-                $self->loging(0, "%s file has not been processed, but change, retrying", $file);
+                $self->loging(0, 
+                    "%s file has not been processed, but change, retrying",
+                    $self->{archivefile}
+                );
                 return 1;
             }
@@ -172 +171 @@
         
     } else {
-        $self->loging(0, "%s is new files", $file);
-        $self->{status}->AddSection($file);
-        $self->{status}->newval($file, 'mtime', $filestats[9]);
-        $self->{status}->newval($file, 'size', $filestats[7]);
+        $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]);
         return 1;
     }
@@ -182 +181 @@
 sub parse_archive {
     my ($self) = @_;
-    my $file = $self->{archive}; # quick compatibility
 
     my $newer = $self->file_need_parse();
 
-    $self->loging(0, "trying to read archive content of %s", $file);
-    $self->{Oarchive} = ObsData::Archive->new("$self->{dir}/$file") or do {
+    $self->loging(0, "trying to read archive content of %s", $self->{archivefile});
+    $self->{Oarchive} = ObsData::Archive->new("$self->{dir}/$self->{archivefile}") or do {
         $self->loging(4, 
             "Can't handle archive %s: %s, skipping",
-            $file,
+            $self->{archivefile},
             ObsData::Archive->error
         );
@@ -196 +194 @@
     };
     
-    foreach my $content ($self->{Oarchive}->ls) {
-        $self->loging(0, "archive %s: content %s", $file, $content);
+    foreach my $datafile ($self->{Oarchive}->ls) {
+        $self->loging(0, "archive %s: content %s", $self->{archivefile}, $datafile);
         my $data = ObsData::Repository::archive::data->new(
             $self,
-            $content,
+            $datafile,
         );
         $data->dispatch;
@@ -211 +209 @@
 
 sub new {
-    my ($class, $or, $content) = @_;
-    
-    my $newor = { %$or };
-
-    $newor->{content} = $content;
-    
-    bless($newor, $class);
+    my ($class, $parent, $datafile) = @_;
+    
+    my $ORad = { %$parent };
+
+    $ORad->{datafile} = $datafile;
+    
+    bless($ORad, $class);
 }
 
@@ -228 +226 @@
 sub dispatch {
     my ($self) = @_;
-    my $file = $self->{archive}; # quick compatibility
-    my $archive = $self->{Oarchive}; # quick compatibility
-    my $content = $self->{content}; # quick compatibility
-
-    my $last_process = $self->{status}->val($file, "data_processtime_$content");
+
+    my $last_process = $self->{status}->val($self->{archivefile}, "data_processtime_$self->{datafile}");
     if ($last_process) {
         $self->loging(0, "%s/%s has been already processed at %s, skipping",
-            $file,
-            $content,
+            $self->{archivefile},
+            $self->{datafile},
             scalar(localtime($last_process)),
         );
@@ -243 +238 @@
     
     my ($datatype, $destfile) = $self->{obsdata}->build_dest_filename(
-        $content, 
+        $self->{datafile}, 
         $self->{datatype}
     );
     
     $self->loging(0, "%s/%s file, datatype %s, destination %s",
-        $file, $content,
+        $self->{archivefile},
+        $self->{datafile},
         $datatype || '(none)',
         $destfile || '(none)',
@@ -255 +251 @@
     my $ltime = time;
     $self->{status}->newval(
-        $file,
-        "data_processtime_$content",
+        $self->{archivefile},
+        "data_processtime_$self->{datafile}",
         $ltime
     );
     $self->{status}->SetParameterComment(
-        $file, 
-        "data_processtime_$content",
+        $self->{archivefile}, 
+        "data_processtime_$self->{datafile}",
         $ObsData::CVSID,
         $ObsData::Repository::CVSID,
@@ -269 +265 @@
     
     if (!$datatype) {
-        $self->loging(3, "I don't know what to do of %s/%s", $file, $content);
+        $self->loging(3,
+            "I don't know what to do of %s/%s",
+            $self->{archivefile},
+            $self->{datafile}
+        );
         return;
     } elsif ($destfile) {
-        $self->loging(0, "Extracting %s/%s to %s", $file, $content, $destfile);
+        $self->loging(0,
+            "Extracting %s/%s to %s", $self->{archivefile},
+            $self->{datafile},
+            $destfile
+        );
 
         my ($dirname) = $destfile =~ m!(?:(.*)/)?(.*)$!; #! vim syntax
@@ -283 +287 @@
         }
 
-        if ($archive->extract($content, $destfile)) {
-            $self->{status}->newval($file, "data_type_$content", $datatype);
-            $self->{status}->newval($file, "data_dest_$content", $destfile);
+        if ($self->{Oarchive}->extract($self->{datafile}, $destfile)) {
+            $self->{status}->newval($self->{archivefile}, "data_type_$self->{datafile}", $datatype);
+            $self->{status}->newval($self->{archivefile}, "data_dest_$self->{datafile}", $destfile);
         } else {
             $self->loging(
                 4, "Can't extract %s/%s to %s: %s",
-                $file, $content, $destfile,
-                $archive->error,
+                $self->{archivefile}, $self->{datafile}, $destfile,
+                $self->{Oarchive}->error,
             );
         }
@@ -297 +301 @@
         $self->loging(3,
             "%s/%s has type %s but no destination",
-            $file, $content, $datatype
+            $self->{archivefile}, $self->{datafile}, $datatype
         );
     }