Changeset 22814

Timestamp:

2010-08-31T12:31:39+12:00 (14 years ago)

Author:

kjdon

Message:

removes tidy_item_file from store_block_files as it makes the file new again (reads it in and writes it out) before we have worked out what is now/old, and means that it will always be reindexed

File:

• main/trunk/greenstone2/perllib/plugins/PagedImagePlugin.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugins/PagedImagePlugin.pm

@@ -257 +257 @@
     my $xml_version = $self->is_xml_item_file($filename_full_path);
     
-    # do we need to do this? if we do it here, then don't need to do it later
-    $self->tidy_item_file($filename_full_path);
+    # do we need to do this? 
+    # does BOM interfere just with XML parsing? In that case don't need it here
+    # if we do it here, we are modifying the file before we have worked out if
+    # its new or not, so it will always be reimported.
+    #$self->tidy_item_file($filename_full_path);
 
     my ($dir, $file) = $filename_full_path =~ /^(.*?)([^\/\\]*)$/;
@@ -301 +304 @@
     my $xml_version = $self->is_xml_item_file($filename_full_path);
 
-    # have done this already in store_block_files
-    #$self->tidy_item_file($filename_full_path);
+    $self->tidy_item_file($filename_full_path);
     
     my $doc_obj;