Changeset 20577

Timestamp:

2009-09-10T10:50:05+12:00 (15 years ago)

Author:

davidb

Message:

Changes to support new incremental_mode variable, and to track metadata.xml files more closely so incremental building works when a document is first build without any metadata attached, then then in a subsequent build has metadata from such a source as metadata.xml added.

Location:

gsdl/trunk/perllib/plugins

Files:

• ArchivesInfPlugin.pm (modified) (1 diff)
• BasePlugin.pm (modified) (2 diffs)
• DirectoryPlugin.pm (modified) (4 diffs)
• MetadataXMLPlugin.pm (modified) (3 diffs)
• PrintInfo.pm (modified) (1 diff)

gsdl/trunk/perllib/plugins/ArchivesInfPlugin.pm

@@ -146 +146 @@
 }
 
-# called if we are doing incremental building
-sub set_incremental {
-    my $self = shift(@_);
-    my ($incremental) = @_;
-
-    $self->{'incremental'} = $incremental;
-}
 
 # return 1 if this class might recurse using $pluginfo

gsdl/trunk/perllib/plugins/BasePlugin.pm

@@ -337 +337 @@
 }
 
-sub set_incremental {
-    my $self = shift(@_);
-    my ($incremental) = @_;
-
-    $self->{'incremental'} = $incremental;
-}
 
 # this function should be overridden to return 1
@@ -941 +935 @@
     # can we process this file??
     my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file);
+
     return undef unless $self->can_process_this_file($filename_full_path);
     

gsdl/trunk/perllib/plugins/DirectoryPlugin.pm

@@ -148 +148 @@
 
 
-# called if we are doing incremental building
-sub set_incremental {
-    my $self = shift(@_);
-    my ($incremental) = @_;
-
-    $self->{'incremental'} = $incremental;
-}
 
 # return 1 if this class might recurse using $pluginfo
@@ -283 +276 @@
 
     $block_hash->{'all_files'} = {} unless defined $block_hash->{'all_files'};
+    $block_hash->{'metadata_files'} = {} unless defined $block_hash->{'metadata_files'};
 
     $block_hash->{'file_blocks'} = {} unless defined $block_hash->{'file_blocks'};
@@ -597 +591 @@
     }
 
-
     if (defined $self->{'inf_timestamp'}) {
         # Look to see if it's a completely new file
@@ -608 +601 @@
         if (! -d $full_filename) {
             if (!$block_hash->{'reindex_files'}->{$full_filename}) {
-            # filename has been around for longer than inf
+            # filename has been around for longer than inf_timestamp
             print $outhandle "**** Skipping $subfile\n" if ($verbosity >3);
             next;

gsdl/trunk/perllib/plugins/MetadataXMLPlugin.pm

@@ -164 +164 @@
 
 
+sub file_block_read {
+    my $self = shift (@_);
+    my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $gli) = @_;
+
+    my $filename = &util::filename_cat($base_dir, $file);
+    if ($filename !~ /metadata\.xml$/ || !-f $filename) {
+        return undef;
+    }
+
+    $block_hash->{'metadata_files'}->{$filename} = 1;
+
+    return 1;
+}
+
 sub metadata_read
 {
@@ -179 +193 @@
     $self->{'metadata-filename'} = $filename;
 
+
     my $outhandle = $self->{'outhandle'};
     
@@ -185 +200 @@
     # add the file to the block list so that it won't be processed in read, as we will do all we can with it here
     $block_hash->{'file_blocks'}->{$filename} = 1;
+
     $self->{'metadataref'} = $extrametadata;
     $self->{'metafileref'} = $extrametafile;

gsdl/trunk/perllib/plugins/PrintInfo.pm

@@ -106 +106 @@
 #sub init {
 #}
+
+
+sub set_incremental {
+    my $self = shift(@_);
+    my ($incremental_mode) = @_;
+
+    if (!defined $incremental_mode) {
+    $self->{'incremental'} = 0;
+    $self->{'incremental_mode'} = "none";
+    }
+    elsif ($incremental_mode eq "none") {
+    $self->{'incremental'} = 0;
+    $self->{'incremental_mode'} = "none";
+    }
+    else {
+    $self->{'incremental'} = 1;
+    $self->{'incremental_mode'} = $incremental_mode;
+    }   
+}
 
 sub get_arguments