Changeset 30601

Timestamp:

2016-07-05T19:02:45+12:00 (7 years ago)

Author:

ak19

Message:

Fix to get incremental building to work with a manifest that specifies which files to delete. (Already got add and reindex working again recently.)

File:

• main/trunk/greenstone2/perllib/manifest.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/manifest.pm

@@ -182 +182 @@
     my ($expat, $element) = @_;
 
+    print STDERR "@@@@ element: $element\n";
+
     if ($element eq "Filename")
     {
@@ -187 +189 @@
     my $filename  = $self->{'item-val'};
 
+    print STDERR "@@@@ filename: $filename\n";
+
     $self->{$filetype}->{$filename} = 1;
     $self->{'item-val'} = undef;
@@ -197 +201 @@
 
     if (defined $self->{'_infodbtype'}) {
-        
 
         my $infodbtype = $self->{'_infodbtype'};
@@ -205 +208 @@
         
         my $doc_source_file = $doc_rec->{'src-file'}->[0];
-        my $assoc_files = $doc_rec->{'assoc-file'};
-        my @all_files = ($doc_source_file);
-        push(@all_files,@$assoc_files) if defined $assoc_files;
-
-        foreach my $filename (@all_files) {
+
+        if(!$doc_source_file) {
+        $self->{'item-val'} = undef;
+        }
+        else {
+        my $assoc_files = $doc_rec->{'assoc-file'};
+        my @all_files = ($doc_source_file);
+        push(@all_files,@$assoc_files) if defined $assoc_files;
         
-        $filename = &util::placeholders_to_abspath($filename);
-
-        if (!&FileUtils::isFilenameAbsolute($filename)) {
-            $filename = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},$filename);
+        foreach my $filename (@all_files) {
+            
+            $filename = &util::placeholders_to_abspath($filename);
+            
+            if (!&FileUtils::isFilenameAbsolute($filename)) {
+            $filename = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},$filename);
+            }
+            
+            $self->{$filetype}->{$filename} = 1;
         }
-
-        $self->{$filetype}->{$filename} = 1;
         }
     }