Changeset 2796

Timestamp:

2001-10-12T12:07:31+13:00 (23 years ago)

Author:

sjboddie

Message:

* empty log message *

Location:

trunk/gsdl/perllib/plugins

Files:

• BasPlug.pm (modified) (2 diffs)
• ConvertToPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/plugins/BasPlug.pm

@@ -300 +300 @@
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Language", $language);
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Encoding", $encoding);
-    $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Source", &ghtml::dmsafe($file));
+    my ($filemeta) = $file =~ /([^\\\/]+)$/;
+    $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Source", &ghtml::dmsafe($filemeta));
     
     # read in file ($text will be in utf8)
@@ -694 +695 @@
     $stats->{'num_processed'} += $self->{'num_processed'};
     $stats->{'num_not_processed'} += $self->{'num_not_processed'};
+    $stats->{'num_archives'} += $self->{'num_archives'};
 
 }

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -233 +233 @@
     my $outhandle = $self->{'outhandle'};
 
-    my $filename = &util::filename_cat($base_dir, $file);
+    my $filename = $file;
+    $filename = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
+
     if ($self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/) {
     $self->{'num_blocked'} ++;
@@ -284 +286 @@
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Language", $language);
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Encoding", $encoding);
-    $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Source", &ghtml::dmsafe($file));
-
+    my ($filemeta) = $file =~ /([^\\\/]+)$/;
+    $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Source", &ghtml::dmsafe($filemeta));
 
     # include any metadata passed in from previous plugins