source: main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm@ 23335

Last change on this file since 23335 was 23335, checked in by davidb, 13 years ago

Work done on improving handing of filenames when the actualy filename encoding used is not necesarrily known. Tested for Linux. Work currently includes some debug statements that will be removed once testing for Windows and Mac is done.

  • Property svn:executable set to *
  • Property svn:keywords set to Author Date Id Revision
File size: 21.2 KB
Line 
1###########################################################################
2#
3# DirectoryPlugin.pm --
4# A component of the Greenstone digital library software
5# from the New Zealand Digital Library Project at the
6# University of Waikato, New Zealand.
7#
8# Copyright (C) 1999 New Zealand Digital Library Project
9#
10# This program is free software; you can redistribute it and/or modify
11# it under the terms of the GNU General Public License as published by
12# the Free Software Foundation; either version 2 of the License, or
13# (at your option) any later version.
14#
15# This program is distributed in the hope that it will be useful,
16# but WITHOUT ANY WARRANTY; without even the implied warranty of
17# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18# GNU General Public License for more details.
19#
20# You should have received a copy of the GNU General Public License
21# along with this program; if not, write to the Free Software
22# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
23#
24###########################################################################
25
26# DirectoryPlugin is a plugin which recurses through directories processing
27# each file it finds - which basically means passing it down the plugin
28# pipeline
29
30package DirectoryPlugin;
31
32use PrintInfo;
33use plugin;
34use util;
35use metadatautil;
36
37use File::Basename;
38use strict;
39no strict 'refs';
40no strict 'subs';
41
42use Encode;
43
44BEGIN {
45 @DirectoryPlugin::ISA = ('PrintInfo');
46}
47
48my $arguments =
49 [ { 'name' => "block_exp",
50 'desc' => "{BasePlugin.block_exp}",
51 'type' => "regexp",
52 'deft' => &get_default_block_exp(),
53 'reqd' => "no" },
54 # this option has been deprecated. leave it here for now so we can warn people not to use it
55 { 'name' => "use_metadata_files",
56 'desc' => "{DirectoryPlugin.use_metadata_files}",
57 'type' => "flag",
58 'reqd' => "no",
59 'hiddengli' => "yes" },
60 { 'name' => "recheck_directories",
61 'desc' => "{DirectoryPlugin.recheck_directories}",
62 'type' => "flag",
63 'reqd' => "no" } ];
64
65my $options = { 'name' => "DirectoryPlugin",
66 'desc' => "{DirectoryPlugin.desc}",
67 'abstract' => "no",
68 'inherits' => "yes",
69 'args' => $arguments };
70
71sub new {
72 my ($class) = shift (@_);
73 my ($pluginlist,$inputargs,$hashArgOptLists) = @_;
74 push(@$pluginlist, $class);
75
76 push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
77 push(@{$hashArgOptLists->{"OptList"}},$options);
78
79 my $self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists);
80
81 if ($self->{'info_only'}) {
82 # don't worry about any options or initialisations etc
83 return bless $self, $class;
84 }
85
86 # we have left this option in so we can warn people who are still using it
87 if ($self->{'use_metadata_files'}) {
88 die "ERROR: DirectoryPlugin -use_metadata_files option has been deprecated. Please remove the option and add MetadataXMLPlug to your plugin list instead!\n";
89 }
90
91 $self->{'num_processed'} = 0;
92 $self->{'num_not_processed'} = 0;
93 $self->{'num_blocked'} = 0;
94 $self->{'num_archives'} = 0;
95
96 $self->{'subdir_extrametakeys'} = {};
97
98 return bless $self, $class;
99}
100
101# called once, at the start of processing
102sub init {
103 my $self = shift (@_);
104 my ($verbosity, $outhandle, $failhandle) = @_;
105
106 # verbosity is passed through from the processor
107 $self->{'verbosity'} = $verbosity;
108
109 # as are the outhandle and failhandle
110 $self->{'outhandle'} = $outhandle if defined $outhandle;
111 $self->{'failhandle'} = $failhandle;
112
113}
114
115# called once, after all passes have finished
116sub deinit {
117 my ($self) = @_;
118
119}
120
121# called at the beginning of each plugin pass (import has one, building has many)
122sub begin {
123 my $self = shift (@_);
124 my ($pluginfo, $base_dir, $processor, $maxdocs) = @_;
125
126 # Only lookup timestamp info for import.pl, and only if incremental is set
127 my $proc_package_name = ref $processor;
128 if ($proc_package_name !~ /buildproc$/ && $self->{'incremental'} == 1) {
129 # Get the infodbtype value for this collection from the arcinfo object
130 my $infodbtype = $processor->getoutputinfo()->{'infodbtype'};
131 $infodbtype = "gdbm" if $infodbtype eq "gdbm-txtgz"; # in archives, cannot use txtgz version
132 my $output_dir = $processor->getoutputdir();
133 my $archives_inf = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", $output_dir);
134
135 if ( -e $archives_inf ) {
136 $self->{'inf_timestamp'} = -M $archives_inf;
137 }
138 }
139}
140
141sub remove_all {
142 my $self = shift (@_);
143 my ($pluginfo, $base_dir, $processor, $maxdocs) = @_;
144
145}
146
147
148sub remove_one {
149 my $self = shift (@_);
150 my ($file, $oids, $archivedir) = @_;
151 return undef; # this will never be called for directories (will it??)
152
153}
154
155
156# called at the end of each plugin pass
157sub end {
158 my ($self) = shift (@_);
159
160}
161
162
163
164# return 1 if this class might recurse using $pluginfo
165sub is_recursive {
166 my $self = shift (@_);
167
168 return 1;
169}
170
171sub get_default_block_exp {
172 my $self = shift (@_);
173
174 return '(?i)(CVS|\.svn|Thumbs\.db|OIDcount|~)$';
175}
176
177sub check_directory_path {
178
179 my $self = shift(@_);
180 my ($dirname) = @_;
181
182 return undef unless (-d $dirname);
183
184 return 0 if ($self->{'block_exp'} ne "" && $dirname =~ /$self->{'block_exp'}/);
185
186 my $outhandle = $self->{'outhandle'};
187
188 # check to make sure we're not reading the archives or index directory
189 my $gsdlhome = quotemeta($ENV{'GSDLHOME'});
190 if ($dirname =~ m/^$gsdlhome\/.*?\/import.*?\/(archives|index)$/) {
191 print $outhandle "DirectoryPlugin: $dirname appears to be a reference to a Greenstone collection, skipping.\n";
192 return 0;
193 }
194
195 # check to see we haven't got a cyclic path...
196 if ($dirname =~ m%(/.*){,41}%) {
197 print $outhandle "DirectoryPlugin: $dirname is 40 directories deep, is this a recursive path? if not increase constant in DirectoryPlugin.pm.\n";
198 return 0;
199 }
200
201 # check to see we haven't got a cyclic path...
202 if ($dirname =~ m%.*?import/(.+?)/import/\1.*%) {
203 print $outhandle "DirectoryPlugin: $dirname appears to be in a recursive loop...\n";
204 return 0;
205 }
206
207 return 1;
208}
209
210# this may be called more than once
211sub sort_out_associated_files {
212
213 my $self = shift (@_);
214 my ($block_hash) = @_;
215 if (!scalar (keys %{$block_hash->{'shared_fileroot'}})) {
216 return;
217 }
218
219 $self->{'assocfile_info'} = {} unless defined $self->{'assocfile_info'};
220 my $metadata = $self->{'assocfile_info'};
221 foreach my $prefix (keys %{$block_hash->{'shared_fileroot'}}) {
222 my $record = $block_hash->{'shared_fileroot'}->{$prefix};
223
224 my $tie_to = $record->{'tie_to'};
225 my $exts = $record->{'exts'};
226
227 if ((defined $tie_to) && (scalar (keys %$exts) > 0)) {
228 # set up fileblocks and assocfile_tobe
229 my $base_file = "$prefix$tie_to";
230 $metadata->{$base_file} = {} unless defined $metadata->{$base_file};
231 my $base_file_metadata = $metadata->{$base_file};
232
233 $base_file_metadata->{'gsdlassocfile_tobe'} = [] unless defined $base_file_metadata->{'gsdlassocfile_tobe'};
234 my $assoc_tobe = $base_file_metadata->{'gsdlassocfile_tobe'};
235 foreach my $e (keys %$exts) {
236 # block the file
237 $block_hash->{'file_blocks'}->{"$prefix$e"} = 1;
238 # set up as an associatd file
239 print STDERR " $self->{'plugin_type'}: Associating $prefix$e with $tie_to version\n";
240 my $mime_type = ""; # let system auto detect this
241 push(@$assoc_tobe,"$prefix$e:$mime_type:");
242
243 }
244 }
245 } # foreach record
246
247 $block_hash->{'shared_fileroot'} = undef;
248 $block_hash->{'shared_fileroot'} = {};
249
250}
251
252
253# do block exp OR special blocking ???
254
255sub file_is_blocked {
256 my $self = shift (@_);
257 my ($block_hash, $filename_full_path) = @_;
258
259 if (defined $block_hash->{'file_blocks'}->{$filename_full_path}) {
260 $self->{'num_blocked'} ++;
261 return 1;
262 }
263 # check Directory plugin's own block_exp
264 if ($self->{'block_exp'} ne "" && $filename_full_path =~ /$self->{'block_exp'}/) {
265 $self->{'num_blocked'} ++;
266 return 1; # blocked
267 }
268 return 0;
269}
270
271
272
273sub file_block_read {
274 my $self = shift (@_);
275 my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $gli) = @_;
276
277 my $outhandle = $self->{'outhandle'};
278 my $verbosity = $self->{'verbosity'};
279
280 # Calculate the directory name and ensure it is a directory and
281 # that it is not explicitly blocked.
282 my $dirname = $file;
283 $dirname = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
284
285 my $directory_ok = $self->check_directory_path($dirname);
286 return $directory_ok unless (defined $directory_ok && $directory_ok == 1);
287
288 print $outhandle "Global file scan checking directory: $dirname\n";
289
290 $block_hash->{'all_files'} = {} unless defined $block_hash->{'all_files'};
291 $block_hash->{'metadata_files'} = {} unless defined $block_hash->{'metadata_files'};
292
293 $block_hash->{'file_blocks'} = {} unless defined $block_hash->{'file_blocks'};
294 $block_hash->{'shared_fileroot'} = {} unless defined $block_hash->{'shared_fileroot'};
295
296 # Recur over directory contents.
297 my (@dir, $subfile);
298 #my $count = 0;
299
300 print $outhandle "DirectoryPlugin block: getting directory $dirname\n" if ($verbosity > 2);
301
302 # find all the files in the directory
303 if (!opendir (DIR, $dirname)) {
304 if ($gli) {
305 print STDERR "<ProcessingError n='$file' r='Could not read directory $dirname'>\n";
306 }
307 print $outhandle "DirectoryPlugin: WARNING - couldn't read directory $dirname\n";
308 return -1; # error in processing
309 }
310 @dir = readdir (DIR);
311 closedir (DIR);
312
313 for (my $i = 0; $i < scalar(@dir); $i++) {
314 my $raw_subfile = $dir[$i];
315 next if ($raw_subfile =~ m/^\.\.?$/);
316
317 my $this_file_base_dir = $base_dir;
318 my $raw_file_subfile = &util::filename_cat($file, $raw_subfile);
319
320 # Recursively read each $raw_subfile
321 print $outhandle "DirectoryPlugin block recurring: $raw_file_subfile\n" if ($verbosity > 2);
322
323 #$count += &plugin::file_block_read ($pluginfo, $this_file_base_dir,
324
325 &plugin::file_block_read ($pluginfo, $this_file_base_dir,
326 $raw_file_subfile,
327 $block_hash, $metadata, $gli);
328
329 }
330 $self->sort_out_associated_files($block_hash);
331 #return $count;
332
333}
334
335# We don't do metadata_read
336sub metadata_read {
337 my $self = shift (@_);
338 my ($pluginfo, $base_dir, $file, $block_hash,
339 $extrametakeys, $extrametadata, $extrametafile,
340 $processor, $gli, $aux) = @_;
341
342 return undef;
343}
344
345
346# return number of files processed, undef if can't process
347# Note that $base_dir might be "" and that $file might
348# include directories
349
350# This function passes around metadata hash structures. Metadata hash
351# structures are hashes that map from a (scalar) key (the metadata element
352# name) to either a scalar metadata value or a reference to an array of
353# such values.
354
355sub read {
356 my $self = shift (@_);
357 my ($pluginfo, $base_dir, $file, $block_hash, $in_metadata, $processor, $maxdocs, $total_count, $gli) = @_;
358
359 my $outhandle = $self->{'outhandle'};
360 my $verbosity = $self->{'verbosity'};
361
362 # Calculate the directory name and ensure it is a directory and
363 # that it is not explicitly blocked.
364 my $dirname;
365 if ($file eq "") {
366 $dirname = $base_dir;
367 } else {
368 $dirname = $file;
369 $dirname = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
370 }
371
372 my $directory_ok = $self->check_directory_path($dirname);
373 return $directory_ok unless (defined $directory_ok && $directory_ok == 1);
374
375 if (($verbosity > 2) && ((scalar keys %$in_metadata) > 0)) {
376 print $outhandle "DirectoryPlugin: metadata passed in: ",
377 join(", ", keys %$in_metadata), "\n";
378 }
379
380
381 # Recur over directory contents.
382 my (@dir, $subfile);
383
384 print $outhandle "DirectoryPlugin read: getting directory $dirname\n" if ($verbosity > 2);
385
386 # find all the files in the directory
387 if (!opendir (DIR, $dirname)) {
388 if ($gli) {
389 print STDERR "<ProcessingError n='$file' r='Could not read directory $dirname'>\n";
390 }
391 print $outhandle "DirectoryPlugin: WARNING - couldn't read directory $dirname\n";
392 return -1; # error in processing
393 }
394 @dir = readdir (DIR);
395 map { $_ = &unicode::raw_filename_to_url_encoded($_) } @dir;
396 closedir (DIR);
397
398 # Re-order the files in the list so any directories ending with .all are moved to the end
399 for (my $i = scalar(@dir) - 1; $i >= 0; $i--) {
400 if (-d &util::filename_cat($dirname, $dir[$i]) && $dir[$i] =~ /\.all$/) {
401 push(@dir, splice(@dir, $i, 1));
402 }
403 }
404
405 # setup the metadata structures. we do a metadata_read pass to see if there is any additional metadata, then pass it to read
406
407 my $additionalmetadata = 0; # is there extra metadata available?
408 my %extrametadata; # maps from filespec to extra metadata keys
409 my %extrametafile; # maps from filespec to the metadata.xml (or similar) file it came from
410 my @extrametakeys; # keys of %extrametadata in order read
411
412
413 my $os_dirsep = &util::get_os_dirsep();
414 my $dirsep = &util::get_dirsep();
415 my $base_dir_regexp = $base_dir;
416 $base_dir_regexp =~ s/\//$os_dirsep/g;
417 my $local_dirname = $dirname;
418
419 $local_dirname =~ s/^$base_dir_regexp($os_dirsep)*//;
420 # if we are in import folder, then local_dirname will be empty
421 if ($local_dirname ne "") {
422 # look for extra metadata passed down from higher folders
423 $local_dirname .= $dirsep;
424 if (defined $self->{'subdir_extrametakeys'}->{$local_dirname}) {
425 my $extrakeys = $self->{'subdir_extrametakeys'}->{$local_dirname};
426 foreach my $ek (@$extrakeys) {
427 my $extrakeys_re = $ek->{'re'};
428 my $extrakeys_md = $ek->{'md'};
429 my $extrakeys_mf = $ek->{'mf'};
430 push(@extrametakeys,$extrakeys_re);
431 $extrametadata{$extrakeys_re} = $extrakeys_md;
432 $extrametafile{$extrakeys_re} = $extrakeys_mf;
433 }
434 delete($self->{'subdir_extrametakeys'}->{$local_dirname});
435 }
436 }
437 # apply metadata pass for each of the files in the directory -- ignore
438 # maxdocs here
439 my $num_files = scalar(@dir);
440 for (my $i = 0; $i < scalar(@dir); $i++) {
441 my $subfile = $dir[$i];
442 next if ($subfile =~ m/^\.\.?$/);
443
444 my $this_file_base_dir = $base_dir;
445 my $raw_subfile = &unicode::url_encoded_to_raw_filename($subfile);
446
447 my $raw_file_subfile = &util::filename_cat($file, $raw_subfile);
448 my $raw_full_filename = &util::filename_cat($this_file_base_dir, $raw_file_subfile);
449
450 if ($self->file_is_blocked($block_hash,$raw_full_filename)) {
451 print STDERR "DirectoryPlugin: file $raw_full_filename was blocked for metadata_read\n" if ($verbosity > 2);
452 next;
453 }
454
455 # Recursively read each $raw_subfile
456 print $outhandle "DirectoryPlugin metadata recurring: $raw_subfile\n" if ($verbosity > 2);
457
458 &plugin::metadata_read ($pluginfo, $this_file_base_dir,
459 $raw_file_subfile,$block_hash,
460 \@extrametakeys, \%extrametadata,
461 \%extrametafile,
462 $processor, $gli);
463 $additionalmetadata = 1;
464 }
465
466 # filter out any extrametakeys that mention subdirectories and store
467 # for later use (i.e. when that sub-directory is being processed)
468 foreach my $ek (@extrametakeys) {
469 my ($subdir_re,$extrakey_dir) = &File::Basename::fileparse($ek);
470 $extrakey_dir =~ s/\\\./\./g; # remove RE syntax for .
471 $extrakey_dir =~ s/\\\\/\\/g; # remove RE syntax for \
472
473 my $dirsep_re = &util::get_re_dirsep();
474
475 my $ek_non_re = $ek;
476 $ek_non_re =~ s/\\\./\./g; # remove RE syntax for .
477 $ek_non_re =~ s/\\\\/\\/g; # remove RE syntax for \
478 if ($ek_non_re =~ m/$dirsep_re/) { # specifies at least one directory
479 my $md = $extrametadata{$ek};
480 my $mf = $extrametafile{$ek};
481
482 my $subdir_extrametakeys = $self->{'subdir_extrametakeys'};
483
484 my $subdir_rec = { 're' => $subdir_re, 'md' => $md, 'mf' => $mf };
485
486 # when its looked up, it must be relative to the base dir
487 push(@{$subdir_extrametakeys->{"$local_dirname$extrakey_dir"}},$subdir_rec);
488 #push(@{$subdir_extrametakeys->{"$extrakey_dir"}},$subdir_rec);
489 }
490 }
491
492 # import each of the files in the directory
493 my $count=0;
494 for (my $i = 0; $i <= scalar(@dir); $i++) {
495 # When every file in the directory has been done, pause for a moment (figuratively!)
496 # If the -recheck_directories argument hasn't been provided, stop now (default)
497 # Otherwise, re-read the contents of the directory to check for new files
498 # Any new files are added to the @dir list and are processed as normal
499 # This is necessary when documents to be indexed are specified in bibliographic DBs
500 # These files are copied/downloaded and stored in a new folder at import time
501 if ($i == $num_files) {
502 last unless $self->{'recheck_directories'};
503
504 # Re-read the files in the directory to see if there are any new files
505 last if (!opendir (DIR, $dirname));
506 my @dirnow = readdir (DIR);
507 map { $_ = &unicode::raw_filename_to_url_encoded($_) } @dirnow;
508 closedir (DIR);
509
510 # We're only interested if there are more files than there were before
511 last if (scalar(@dirnow) <= scalar(@dir));
512
513 # Any new files are added to the end of @dir to get processed by the loop
514 my $j;
515 foreach my $subfilenow (@dirnow) {
516 for ($j = 0; $j < $num_files; $j++) {
517 last if ($subfilenow eq $dir[$j]);
518 }
519 if ($j == $num_files) {
520 # New file
521 push(@dir, $subfilenow);
522 }
523 }
524 # When the new files have been processed, check again
525 $num_files = scalar(@dir);
526 }
527
528 my $subfile = $dir[$i];
529 last if ($maxdocs != -1 && ($count + $total_count) >= $maxdocs);
530 next if ($subfile =~ /^\.\.?$/);
531
532 my $this_file_base_dir = $base_dir;
533 my $raw_subfile = &unicode::url_encoded_to_raw_filename($subfile);
534
535 my $raw_file_subfile = &util::filename_cat($file, $raw_subfile);
536 my $raw_full_filename
537 = &util::filename_cat($this_file_base_dir,$raw_file_subfile);
538
539 if ($self->file_is_blocked($block_hash,$raw_full_filename)) {
540 print STDERR "DirectoryPlugin: file $raw_full_filename was blocked for read\n" if ($verbosity > 2);
541 next;
542 }
543 #print STDERR "processing $raw_full_filename\n";
544 # Follow Windows shortcuts
545 if ($raw_subfile =~ /(?i)\.lnk$/ && $ENV{'GSDLOS'} =~ /^windows$/i) {
546 require Win32::Shortcut;
547 my $shortcut = new Win32::Shortcut(&util::filename_cat($dirname, $raw_subfile));
548 if ($shortcut) {
549 # The file to be processed is now the target of the shortcut
550 $this_file_base_dir = "";
551 $file = "";
552 $raw_subfile = $shortcut->Path;
553 }
554 }
555
556 # check for a symlink pointing back to a leading directory
557 if (-d "$dirname/$raw_subfile" && -l "$dirname/$raw_subfile") {
558 # readlink gives a "fatal error" on systems that don't implement
559 # symlinks. This assumes the the -l test above would fail on those.
560 my $linkdest=readlink "$dirname/$raw_subfile";
561 if (!defined ($linkdest)) {
562 # system error - file not found?
563 warn "DirectoryPlugin: symlink problem - $!";
564 } else {
565 # see if link points to current or a parent directory
566 if ($linkdest =~ m@^[\./\\]+$@ ||
567 index($dirname, $linkdest) != -1) {
568 warn "DirectoryPlugin: Ignoring recursive symlink ($dirname/$raw_subfile -> $linkdest)\n";
569 next;
570 ;
571 }
572 }
573 }
574
575 print $outhandle "DirectoryPlugin: preparing metadata for $raw_subfile\n" if ($verbosity > 2);
576
577 # Make a copy of $in_metadata to pass to $raw_subfile
578 my $out_metadata = {};
579 &metadatautil::combine_metadata_structures($out_metadata, $in_metadata);
580
581 # check the assocfile_info
582 if (defined $self->{'assocfile_info'}->{$raw_full_filename}) {
583 &metadatautil::combine_metadata_structures($out_metadata, $self->{'assocfile_info'}->{$raw_full_filename});
584 }
585
586 # $subfile by this point is url-encoded => all ASCII chars => no need to encode as UTF8
587
588 # Next add metadata read in XML files (if it is supplied)
589 if ($additionalmetadata == 1) {
590 foreach my $filespec (@extrametakeys) {
591 ## use the url-encoded filename to do the filename comparison
592
593 if ($subfile =~ /^$filespec$/) {
594 print $outhandle "File \"$subfile\" matches filespec \"$filespec\"\n"
595 if ($verbosity > 2);
596 my $mdref = $extrametadata{$filespec};
597 my $mfref = $extrametafile{$filespec};
598
599 # Add the list files where the metadata came from
600 # into the metadata table so we can track this
601 # This mechanism is similar to how gsdlassocfile works
602
603 my @metafile_pair = ();
604 foreach my $l (keys %$mfref) {
605 my $f = $mfref->{$l};
606 push (@metafile_pair, "$f : $l");
607 }
608
609 $mdref->{'gsdlmetafile'} = \@metafile_pair;
610
611 &metadatautil::combine_metadata_structures($out_metadata, $mdref);
612 }
613 }
614 }
615
616 if (defined $self->{'inf_timestamp'}) {
617 # Look to see if it's a completely new file
618
619 if (!$block_hash->{'new_files'}->{$raw_full_filename}) {
620 # Not a new file, must be an existing file
621 # Let' see if it's newer than the last import.pl
622
623
624 if (! -d $raw_full_filename) {
625 if (!$block_hash->{'reindex_files'}->{$raw_full_filename}) {
626 # filename has been around for longer than inf_timestamp
627 print $outhandle "**** Skipping $subfile\n" if ($verbosity >3);
628 next;
629 }
630 else {
631 # Remove old folder in archives (might hash to something different)
632 # *** should be doing this on a Del one as well
633 # but leave folder name?? and ensure hashs to
634 # same again??
635
636 # Then let through as new doc??
637
638 # mark to doc-oids that rely on it for re-indexing
639 }
640 }
641 }
642 }
643
644 # Recursively read each $subfile
645 print $outhandle "DirectoryPlugin recurring: $subfile\n" if ($verbosity > 2);
646
647 $count += &plugin::read ($pluginfo, $this_file_base_dir,
648 $raw_file_subfile, $block_hash,
649 $out_metadata, $processor, $maxdocs, ($total_count + $count), $gli);
650 }
651
652 return $count;
653}
654
655sub compile_stats {
656 my $self = shift(@_);
657 my ($stats) = @_;
658}
659
6601;
Note: See TracBrowser for help on using the repository browser.