Changeset 16257

Timestamp:

2008-07-01T12:01:11+12:00 (15 years ago)

Author:

mdewsnip

Message:

Tidied up the block of code that determines whether each doc.xml file should be processed (based on whether incremental building is enabled) to make it easier to follow.

File:

• gsdl/trunk/perllib/plugins/ArchivesInfPlugin.pm (modified) (1 diff)

gsdl/trunk/perllib/plugins/ArchivesInfPlugin.pm

@@ -138 +138 @@
         next if $tmp eq $file;
 
-        # Decide if file needs to be processed
-        my $doc_oid = $subfile->[1];
-        my $index_status = $archive_info->get_status_info($doc_oid);
+        # We always process the file...
+        my $process_file = 1;
 
-        my $process_file = 0;
-        
-        if (!$processor->is_incremental_capable() || !$self->{'incremental'}) {
-        $process_file = 1;
-        }
-        else {
-            # is incremental
-
-            # check to see if file needs to be indexed
-        $index_status = $archive_info->get_status_info($doc_oid);
-
-        if ($index_status eq "I") {
-            $process_file = 1;
+        # ...unless the build processor is incremental capable and -incremental was specified
+        if ($processor->is_incremental_capable() && $self->{'incremental'})
+        {
+            # We don't need to process the file if it has already been built
+        my $doc_oid = $subfile->[1];
+        my $index_status = $archive_info->get_status_info($doc_oid);
+        if ($index_status eq "B")
+        {
+            # Don't process this file
+            $process_file = 0;
         }
         }