Changeset 60

Timestamp:

11/27/05 00:34:02 (19 years ago)

Author:

thauvin

Message:

• match rules should be applies over data file, not the archive

File:

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

trunk/soft/ObsData/ObsData/Repository.pm

@@ -6 +6 @@
 use warnings;
 use ObsData;
+use ObsData::Archive;
 use Config::IniFiles;
 
@@ -71 +72 @@
             }
 
-            if (! $self->file_need_parse($file)) {
+            my $newer = $self->file_need_parse($file);
+
+
+            $self->loging(0, "trying to read archive content of %s", $file);
+            my $archive = ObsData::Archive->new("$self->{dir}/$file") or do {
+                $self->loging(4, 
+                    "Can't handle archive %s: %s, skipping",
+                    $file,
+                    ObsData::Archive->error
+                );
                 next;
+            };
+
+            foreach my $content ($archive->ls) {
+                $self->loging(0, "archive %s: content %s", $file, $content);
+                my ($datatype, $destfile) = $self->{obsdata}->build_dest_filename($content, $self->{datatype});
+                $self->loging(0, "%s/%s file, datatype %s, destination %s",
+                    $file, $content,
+                    $datatype || '(none)',
+                    $destfile || '(none)',
+                );
+
+                if (!$datatype) {
+                    $self->loging(3, "I don't know what to do of %s/%s", $file, $content);
+
+                    next;
+                }
             }
-
-            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)',
-            );
-
-            if (!$datatype) {
-                $self->loging(3, "I don't know what to do of %s", $file);
-
-                next;
-            }
-
-            $self->install_file($file, $destfile);
+            # $self->install_file($file, $destfile);
 
         }
@@ -129 +141 @@
         }
         
-        if ($olddatatype) {
+        #if ($olddatatype) {
+        if (defined($oldmtime) && defined($oldsize)) {
             if (! ($sizeok && $mtimeok)) {
                 $self->loging(3, "File %s allready processed but has changed:%s%s, skipping",
@@ -137 +150 @@
                 );
             }
-            $self->loging(0, "%s has been allready processed: was %s", $file, $olddatatype);
+        #    $self->loging(0, "%s has been allready processed: was %s", $file, $olddatatype);
             return 0;
         } else {
@@ -158 +171 @@
 }
 
-sub installfile {
+sub install_file {
+    my ($self, $file) = @_;
     
 }