Changeset 10156

Timestamp:

2005-06-23T11:19:53+12:00 (19 years ago)

Author:

davidb

Message:

Extra functionality introduced to support incremental building.

Location:

trunk/gsdl/perllib/plugins

Files:

• ArcPlug.pm (modified) (5 diffs)
• RecPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/plugins/ArcPlug.pm

@@ -63 +63 @@
 }
 
+sub deinit {
+    my ($self) = @_;
+
+    my $archive_info = $self->{'archive_info'};
+
+    if (defined $archive_info) {
+    my $archive_info_filename = $self->{'archive_info_filename'};
+
+        my $file_list = $archive_info->get_file_list();
+
+    # change each file to "Been Indexed"
+
+    foreach my $subfile (@$file_list) {
+        my $doc_oid = $subfile->[1];
+        $index_status = $archive_info->get_status_info($doc_oid);
+        $archive_info->set_status_info($doc_oid,"B");
+    }
+
+    $archive_info->save_info($archive_info_filename);
+    }
+}
+
 # return 1 if this class might recurse using $pluginfo
 sub is_recursive {
@@ -69 +91 @@
     return 1;
 }
+
+
+
 
 # return number of files processed, undef if can't process
@@ -82 +107 @@
     # see if this has a archives information file within it
     my $archive_info_filename = &util::filename_cat($base_dir,$file,"archives.inf");
+    $self->{'archive_info_filename'} = $archive_info_filename;
 
     if (-e $archive_info_filename) {
@@ -90 +116 @@
     # read in the archives information file
     my $archive_info = new arcinfo ();
+    $self->{'archive_info'} = $archive_info;
+
     $archive_info->load_info ($archive_info_filename);
     
@@ -100 +128 @@
         my $tmp = &util::filename_cat ($file, $subfile->[0]);
         next if $tmp eq $file;
-        # note: metadata is not carried on to the next level
-        $count += &plugin::read ($pluginfo, $base_dir, $tmp, {}, $processor, $maxdocs, ($total_count+$count), $gli);
+        
+        my $doc_oid = $subfile->[1];
+
+        $index_status = $archive_info->get_status_info($doc_oid);
+
+        my $processor_mode = $processor->get_mode();        
+
+        if (($processor_mode eq "infodb") || ($index_status eq "I")) {
+
+        # note: metadata is not carried on to the next level
+        $count += &plugin::read ($pluginfo, $base_dir, $tmp, {}, $processor, $maxdocs, ($total_count+$count), $gli);
+        }
+
     }
 

trunk/gsdl/perllib/plugins/RecPlug.pm

@@ -166 +166 @@
 }
 
+sub begin {
+    my $self = shift (@_);
+    my ($pluginfo, $base_dir, $processor, $maxdocs) = @_;
+
+    my $proc_package_name = ref $processor;
+
+    if ($proc_package_name !~ /buildproc$/) {
+
+    # Only lookup timestamp info for import.pl
+
+    my $output_dir = $processor->getoutputdir();
+    my $archives_inf = &util::filename_cat($output_dir,"archives.inf");
+    
+    if ( -e $archives_inf ) {
+        $self->{'inf_timestamp'} = -M $archives_inf;
+    }
+    }
+
+    $self->SUPER::begin($pluginfo, $base_dir, $processor, $maxdocs);
+}
+
+
 # return 1 if this class might recurse using $pluginfo
 sub is_recursive {
@@ -413 +435 @@
         }
     }
-    
+
+
+    my $file_subfile = &util::filename_cat($file, $subfile);
+    my $filename_subfile 
+        = &util::filename_cat($this_file_base_dir,$file_subfile);
+    if (defined $self->{'inf_timestamp'}) {
+        my $inf_timestamp = $self->{'inf_timestamp'};
+
+        if (! -d $filename_subfile) {
+        my $filename_timestamp = -M $filename_subfile;
+        if ($filename_timestamp > $inf_timestamp) {
+            # filename has been around for longer than inf
+#####           print $outhandle "**** Skipping $subfile\n";
+            next;
+        }
+        }
+    }
+
     # Recursively read each $subfile
     print $outhandle "RecPlug recurring: $subfile\n" if ($verbosity > 2);
     
     $count += &plugin::read ($pluginfo, $this_file_base_dir,
-                 &util::filename_cat($file, $subfile),
+                 $file_subfile,
                  $out_metadata, $processor, $maxdocs, ($total_count + $count), $gli);
     }