Changeset 1410 for trunk

Timestamp:

2000-08-16T17:48:49+12:00 (24 years ago)

Author:

davidb

Message:

Introduction of "ConvertTo" family of plugins. This establishes
a new inheritance hierarchy.

BasPlug -> ConvertToBasPlug -> HTMLPlug/TEXTPlug -> ConvertToPlug

-> PDFPlug/WordPlug/Future application plugins

Location:

trunk/gsdl/perllib/plugins

Files:

• ConvertToBasPlug.pm (added)
• ConvertToPlug.pm (added)
• HTMLPlug.pm (modified) (10 diffs)
• PDFPlug.pm (added)
• TEXTPlug.pm (modified) (2 diffs)
• WordPlug.pm (added)

trunk/gsdl/perllib/plugins/HTMLPlug.pm

@@ -38 +38 @@
 package HTMLPlug;
 
-use BasPlug;
+use ConvertToBasPlug;
 use ghtml;
 use util;
@@ -44 +44 @@
 
 sub BEGIN {
-    @ISA = ('BasPlug');
+    @ISA = ('ConvertToBasPlug');
 }
 
@@ -67 +67 @@
     print STDERR "                          creates much shallower directory structure (useful when creating\n";
     print STDERR "                          collections to go on cd-rom).\n\n";
+    print STDERR "   -title_sub             Substitution expression to modify string stored as Title.\n";
+    print STDERR "                          Used by, for example, PDFHtml to remove Page 1 etc from text\n";
+    print STDERR "                          chosen to be used as the title.\n";
 }
 
 sub new {
     my $class = shift (@_);
-    my $self = new BasPlug ("HTMLPlug", @_);
+    my $self = new ConvertToBasPlug ($class, @_);
 
     if (!parsargv::parse(\@_, 
@@ -81 +84 @@
              q^assoc_files/.*/(?i)\.(jpe?g|gif|png|css|pdf)$^, \$self->{'assoc_files'},
              q^rename_assoc_files^, \$self->{'rename_assoc_files'},
+             q^title_sub/.*/^, \$self->{'title_sub'},
              "allow_extra_options")) {
 
@@ -91 +95 @@
     $self->{'dir_num'} = 0;
     $self->{'file_num'} = 0;
-    
+
+    $self->{'convert_to'} = "HTML";
+    $self->{'convert_to_ext'} = "html";
+
     return bless $self, $class;
 }
@@ -222 +229 @@
     my $filename = $href;
     $filename =~ s/^[^:]*:\/\///;
-    $filename = &util::filename_cat ($base_dir, $filename);
+    $filename = &util::filename_cat($base_dir, $filename);
+
     my ($ext) = $filename =~ /(\.[^\.]*)$/;
 
@@ -296 +304 @@
         $before_hash =~ s/\\/\//g; # for windows
         }
+        else
+        {
+        # see if link shares directory with source document
+        # => turn into relative link if this is so!
+        my $before_hash_fix = &util::filename_cat("",$before_hash);
+        $before_hash_fix =~ s/^$base_dir(\\|\/)//;
+        $before_hash = $before_hash_fix;
+
+        }
+
 
     } else {
@@ -304 +322 @@
     }
 
+
+    my $linkfilename = &util::filename_cat ($base_dir, $before_hash); 
+
     # make sure there's a slash on the end if it's a directory
-    my $linkfilename = &util::filename_cat ($base_dir, $before_hash);
     if ($before_hash !~ /\/$/) {
         $before_hash .= "/" if (-d $linkfilename);
@@ -364 +384 @@
         my $tmptext = $$textref;
         $tmptext =~ s/\s+/ /gs;
+        $tmptext =~ s/$self->{'title_sub'}// if (defined $self->{'title_sub'});
         $tmptext =~ s/<[^>]*>//g;
         $tmptext = substr ($tmptext, 0, 100);
@@ -379 +400 @@
         $tmptext =~ s/\s+/ /gs;
         $tmptext =~ s/.*<body[^>]*>//i;
+        $tmptext =~ s/$self->{'title_sub'}// if (defined $self->{'title_sub'});
         $tmptext =~ s/<[^>]*>//g;
         $tmptext = substr ($tmptext, 0, 200);

trunk/gsdl/perllib/plugins/TEXTPlug.pm

@@ -29 +29 @@
 package TEXTPlug;
 
-use BasPlug;
+use ConvertToBasPlug;
 
 sub BEGIN {
-    @ISA = ('BasPlug');
+    @ISA = ('ConvertToBasPlug');
 }
 
@@ -39 +39 @@
 sub new {
     my ($class) = @_;
-    my $self = new BasPlug ("TEXTPlug", @_);
+    my $self = new ConvertToBasPlug ($class, @_);
+
+    $self->{'convert_to'} = "TEXT";
+    $self->{'convert_to_ext'} = "txt";
 
     return bless $self, $class;