Changeset 96

Timestamp:

12/03/05 04:59:51 (19 years ago)

Author:

thauvin

Message:

• split code again

Location:

trunk/soft/ObsData

Files:

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

trunk/soft/ObsData/ObsData.pm

@@ -270 +270 @@
 }
 
-sub find_file_obs {
+sub process_obs {
     my ($self, $obs) = @_;
     my %datadir = $self->list_obsdatadir($obs);
@@ -276 +276 @@
     
     foreach my $datatype (keys %datadir) {
-        my $or = ObsData::Repository::dir->new(
-            {
-                obsdata => $self,
-                dir => $datadir{$datatype},
-                obs => $obs,
-                datatype => $datatype,
-                statusfile => "$datadir{$datatype}/obsdata.ini"
-            }
+        my $or = $self->get_obs_data_handle($obs, $datatype);
+        $or or next;
+        $or->process;
+    }
+}
+
+sub get_obs_data_handle {
+    my ($self, $obs, $datatype) = @_;
+
+    my $dir = $self->getvalue($obs, ($datatype ? "datadir/$datatype" : "datadir"));
+    if (!$dir) {
+        $self->loging(4,
+            "Can't find data directory for %s, type: %s",
+            $obs, $datatype || '(none)'
         );
-        if (!defined($or)) {
-            $self->loging(4, "Can't parse %s, check directory exists", $datadir{$datatype});
-            next;
-        }
-        $or->process;
-    }
+        return undef;
+    }
+    my $or = ObsData::Repository::dir->new(
+        {
+            obsdata => $self,
+            dir => $dir,
+            obs => $obs,
+            datatype => $datatype,
+            statusfile => "$dir/obsdata.ini"
+        }
+    );
+    if (!defined($or)) {
+        $self->loging(4, "Can't parse %s, check directory exists", $dir);
+        return undef;
+    }
+    
+    return($or);
 }
 

trunk/soft/ObsData/ObsData/Repository.pm

@@ -141 +141 @@
             archivefile => $file,
         );
+        $orda->get_info;
+        if(!$orda->file_need_parse) {
+            next;
+        }
         $orda->process;
     }
@@ -157 +161 @@
     $or->{dir} or die "No dir given";
     $or->{archivefile} or die "No archivefile given";
+    
+    $or->loging(0,
+        "Preparing to parse %s/%s",
+         $or->{dir},
+         $or->{archivefile}
+    );
 
     bless($or, $class);
@@ -236 +246 @@
     foreach (keys %{$self->{changes}}) {
         if (defined($self->{changes}{$_}) && $self->{do_if_change}{$_}) {
-            $self->loging(0, $self->{changes}{$_});
+            $self->loging(0, "%s => make parse need", $self->{changes}{$_});
             $need++;
         }
@@ -411 +421 @@
     my ($self) = @_;
 
-    if (!$self->get_info) {
-        return 0;
-    }
-
     foreach my $data ($self->list_archive) {
         if ($self->data_lastcheck($data)) {

trunk/soft/ObsData/bin/obsdata

@@ -13 +13 @@
     'c=s' => \my $configfile,
     'logfile=s' => \my $log,
-    'i|init' => \my $init,
     'debug' => sub { $verbose = 0 },
     'v' => sub { $verbose-- },
@@ -28 +27 @@
 ) or die "Can't create obsdata obj";
 
-if ($init) {
-    $obsdata->init_repository or die "Can't init repository";
-}
 
 $obsdata->load or die "Can load osbdata";
 
-$obsdata->find_file_obs('ohp');
+my @obs = $obsdata->list_obs;
+my @datatype = ();
+
+foreach my $o (@obs) {
+    my %datadir = $obsdata->list_obsdatadir($o);
+    foreach my $d (keys %datadir) {
+        if(@datatype && !grep { $_ eq $d } @datatype) {
+            next;
+        }
+        my $dir = $obsdata->get_obs_data_handle($o, $d) or next;
+        $dir->process;
+    }
+}