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

Timestamp:

2010-07-06T14:52:40+12:00 (14 years ago)

Author:

kjdon

Message:

previously, when use_realistic_book was set, all files listed in archivesinf dbs were in tidytmp - change paths to be import paths. This assumes that same directory structure is kept in tidytmp, which appears to be the case. No tidytmp paths should now appear in archiveinf dbs

File:

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

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

@@ -753 +753 @@
 
     $filename = &util::filename_cat($base_dir, $filename);
+    if (($self->{'use_realistic_book'}) || ($self->{'old_style_HDL'})) {
+    # we are processing a tidytmp file - want paths to be in import
+    $filename =~ s/([\\\/])tidytmp([\\\/])/$1import$2/;
+    }
     # Replace %XX's in URL with decoded value if required. Note that the filename may include the %XX in some
     # situations. If the *original* file's name was in URL encoding, the following method will not decode it.
@@ -1584 +1588 @@
 } 
 
+sub associate_cover_image
+{
+    my $self = shift(@_);
+    my ($doc_obj, $filename) = @_;
+    if (($self->{'use_realistic_book'}) || ($self->{'old_style_HDL'}))
+    {
+    # we will have cover image in tidytmp, but want it from import
+    $filename =~ s/([\\\/])tidytmp([\\\/])/$1import$2/;
+    }
+    $self->SUPER::associate_cover_image($doc_obj, $filename);
+}
+
+    
 1;