Changeset 23419 for main/trunk/greenstone2/perllib/plugins/BasePlugin.pm

Timestamp:

2010-12-09T00:10:10+13:00 (13 years ago)

Author:

max

Message:

Setting the values to store as block files is now done through an API call to BasePlugin. This way, anything uniform requirement (such as putting in both C:\... and c:\... entries for Windows) can be done in one place.

File:

• main/trunk/greenstone2/perllib/plugins/BasePlugin.pm (modified) (4 diffs)

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

@@ -382 +382 @@
 }
 
+sub block_filename
+{
+    my $self = shift(@_);
+    my ($block_hash,$filename) = @_;
+    
+    if ($ENV{'GSDLOS'} =~ m/^windows$/) {
+        
+        my $lower_drive = $filename;
+        $lower_drive =~ s/^([A-Z]):/\l$1:/i;
+        
+        my $upper_drive = $filename;
+        $upper_drive =~ s/^([A-Z]):/\u$1:/i;
+        
+        $block_hash->{'file_blocks'}->{$lower_drive} = 1;
+        $block_hash->{'file_blocks'}->{$upper_drive} = 1;       
+    }
+    else {
+        $block_hash->{'file_blocks'}->{$filename} = 1;
+    }
+}
+
 # rename imported files and assoc files using URL encoding by default
 # as this will work for most plugins and give more legible filenames
@@ -417 +438 @@
 
     if ($self->{'block_exp'} ne "" && $filename_full_path =~ /$self->{'block_exp'}/) {
-    $block_hash->{'file_blocks'}->{$filename_full_path} = 1;
+    $self->block_filename($block_hash,$filename_full_path);
     }
 
@@ -437 +458 @@
     }   
     if (&util::fd_exists($coverfile)) {
-        $block_hash->{'file_blocks'}->{$coverfile} = 1;
+        $self->block_filename($block_hash,$coverfile);
     } 
     }
@@ -1169 +1190 @@
     my ($textref, $pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli) = @_;
 
-    gsprintf(STDERR, "BasePlugin::process {common.must_be_implemented}\n") && die "\n";
+    gsprintf(STDERR, "BasePlugin::process {common.must_be_implemented}\n");
+
+    my ($cpackage,$cfilename,$cline,$csubr,$chas_args,$cwantarray) = caller(1);
+    print STDERR "Calling method: $cfilename:$cline $cpackage->$csubr\n";
+
+    die "\n";
 
     return undef; # never gets here