Changeset 16386
- Timestamp:
- 2008-07-14T14:43:50+12:00 (16 years ago)
- Location:
- gsdl/trunk/perllib/plugins
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/perllib/plugins/MetadataCSVPlugin.pm
r15872 r16386 37 37 38 38 39 my $arguments = 40 [ { 'name' => "block_exp",41 'desc' => "{BasePlugin. block_exp}",39 my $arguments = [ 40 { 'name' => "process_exp", 41 'desc' => "{BasePlugin.process_exp}", 42 42 'type' => "regexp", 43 43 'reqd' => "no", 44 'deft' => &get_default_block_exp() } ]; 44 'deft' => &get_default_process_exp() } 45 46 ]; 45 47 46 48 … … 67 69 68 70 69 # Not used, just here to prevent a warning70 71 sub get_default_process_exp 71 72 { … … 73 74 } 74 75 75 76 # Used by BasePlugin read to block this file77 sub get_default_block_exp78 {79 return q^(?i)\.csv$^;80 }81 82 83 76 sub metadata_read 84 77 { 85 78 my $self = shift (@_); 86 my ($pluginfo, $base_dir, $file, $ metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;79 my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_; 87 80 88 81 # Read metadata from CSV files … … 93 86 print STDERR "\n<Processing n='$file' p='MetadataCSVPlugin'>\n" if ($gli); 94 87 print STDERR "MetadataCSVPlugin: processing $file\n" if ($self->{'verbosity'}) > 1; 88 89 # add the file to the block list so that it won't be processed in read, as we will do all we can with it here 90 $block_hash->{'file_blocks'}->{$filename} = 1; 95 91 96 92 # Read the CSV file to get the metadata -
gsdl/trunk/perllib/plugins/MetadataXMLPlugin.pm
r15872 r16386 101 101 102 102 my $arguments = [ 103 { 'name' => " block_exp",104 'desc' => "{BasePlugin. block_exp}",103 { 'name' => "process_exp", 104 'desc' => "{BasePlugin.process_exp}", 105 105 'type' => "regexp", 106 106 'reqd' => "no", 107 'deft' => &get_default_block_exp() } 107 'deft' => &get_default_process_exp() } 108 108 109 ]; 109 110 … … 162 163 } 163 164 164 # We don't want any other plugins to see metadata.xml files165 # block exp are currently only used in the read bit166 sub get_default_block_exp167 {168 return q^metadata\.xml$^;169 }170 165 171 166 sub metadata_read 172 167 { 173 168 my $self = shift (@_); 174 my ($pluginfo, $base_dir, $file, $ metadata, $extrametakeys, $extrametadata,169 my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $extrametakeys, $extrametadata, 175 170 $processor, $maxdocs, $gli) = @_; 176 171 … … 182 177 print STDERR "\n<Processing n='$file' p='MetadataXMLPlugin'>\n" if ($gli); 183 178 print STDERR "MetadataXMLPlugin: processing $file\n" if ($self->{'verbosity'})> 1; 184 179 # add the file to the block list so that it won't be processed in read, as we will do all we can with it here 180 $block_hash->{'file_blocks'}->{$filename} = 1; 185 181 $self->{'metadataref'} = $extrametadata; 186 182 $self->{'metakeysref'} = $extrametakeys; … … 197 193 return -1; #error 198 194 } 195 199 196 return 1; 200 197
Note:
See TracChangeset
for help on using the changeset viewer.