Changeset 19746 for gsdl/trunk/perllib/plugins/DSpacePlugin.pm

Timestamp:

2009-06-05T17:08:45+12:00 (15 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed the DSpace problem where the crucial dublin_core.xml file was being blocked when it shouldn't have been which prevented the necessary files from being processed by the DSpacePlugin at all. Now the DSpace to Greenstone tutorial works again.

File:

• gsdl/trunk/perllib/plugins/DSpacePlugin.pm (modified) (5 diffs)

gsdl/trunk/perllib/plugins/DSpacePlugin.pm

@@ -47 +47 @@
 package DSpacePlugin;
 
-use BasePlugin;
+use ReadTextFile;
 use plugin;
 use XMLParser;
@@ -54 +54 @@
 
 sub BEGIN {
-    @DSpacePlugin::ISA = ('BasePlugin');
+    @DSpacePlugin::ISA = ('ReadTextFile');
 }
 
@@ -104 +104 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
 
-    $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
+    $self = new ReadTextFile($pluginlist, $inputargs, $hashArgOptLists);
     
     if ($self->{'info_only'}) {
@@ -126 +126 @@
     my $self = shift (@_);
 
-    return q^(?i)contents$^;
+    return q^(?i)(contents)$^;
 }
 
@@ -133 +133 @@
     my $self = shift (@_);
     
-    # Block all files besides contents
-    return q^(?i)(handle|dublin_core\.xml|\.tx?t)$^;
+    # Block handle and txt files if present. Specifically don't block dublin_core xml
+    return q^(?i)(handle|\.tx?t)$^;
+}
+
+sub store_block_files_BACKUP
+{
+    # Option of making blocking sensitive to files that are in directory
+    # This subroutine is not currently used! (relies on default block expression stopping all handle and .txt files)
+
+    my $self =shift (@_);
+    my ($filename_full_path, $block_hash) = @_;
+
+    my ($tailname, $contents_basedir, $suffix) = &File::Basename::fileparse($filename_full_path, "\\.[^\\.]+\$");
+    my $handle_filename = &util::filename_cat($contents_basedir,"handle");
+
+    $block_hash->{'file_blocks'}->{$handle_filename} = 1 if (-e $handle_filename);
 }