Changeset 22330 for main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm

Timestamp:

2010-06-30T13:31:14+12:00 (14 years ago)

Author:

kjdon

Message:

we want to store the original file name not the tidy filename as the source file

File:

• main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm (modified) (3 diffs)

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

@@ -269 +269 @@
     my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
         
+    my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file);
     # get the input file
     my $input_filename = $file;
     my ($tailname, $dirname, $suffix) = &File::Basename::fileparse($input_filename, "\\.[^\\.]+\$");
     $suffix = lc($suffix);   
-    
+    my $tidy_filename;
     if (($self->{'use_realistic_book'}) || ($self->{'old_style_HDL'}))
     {
@@ -284 +285 @@
     # get the tidied file
     #my $tidy_filename = $self->tmp_tidy_file($input_filename);
-    my $tidy_filename = $self->convert_tidy_or_oldHDL_file($input_filename);
+    $tidy_filename = $self->convert_tidy_or_oldHDL_file($input_filename);
     
     # derive tmp filename from input filename
@@ -296 +297 @@
     # call the parent read_into_doc_obj
     my ($process_status,$doc_obj) = $self->SUPER::read_into_doc_obj($pluginfo, $base_dir, $file, $block_hash, $metadata, $processor, $maxdocs, $total_count, $gli);
-    
+    if (($self->{'use_realistic_book'}) || ($self->{'old_style_HDL'}))
+    {
+    # now we need to reset the filenames in the doc obj so that the converted filenames are not used
+    my $collect_file = &util::filename_within_collection($filename_full_path);
+    $doc_obj->set_source_filename ($collect_file, $self->{'file_rename_method'}); 
+    ## set_source_filename does not set the doc_obj source_path which is used in archives dbs for incremental
+    # build. so set it manually.
+    $doc_obj->{'source_path'} = $filename_full_path;
+    my $collect_conv_file = &util::filename_within_collection($tidy_filename);
+    $doc_obj->set_converted_filename($collect_conv_file);
+    $self->set_Source_metadata($doc_obj, $filename_no_path);
+    }
     return ($process_status,$doc_obj);
 }