Changeset 7932

Timestamp:

2004-08-12T11:46:31+12:00 (20 years ago)

Author:

mdewsnip

Message:

A first cut at modifying RecPlug to resolve Windows shortcuts successfully. Hasn't had much testing but seems to work OK. It uses a Win32::Shortcut module (Windows only, obviously).

File:

• trunk/gsdl/perllib/plugins/RecPlug.pm (modified) (4 diffs)

trunk/gsdl/perllib/plugins/RecPlug.pm

@@ -192 +192 @@
     my $verbosity = $self->{'verbosity'};
     my $read_metadata_files = $self->{'use_metadata_files'};
-    
+
     # Calculate the directory name and ensure it is a directory and
     # that it is not explicitly blocked.
@@ -199 +199 @@
     return undef unless (-d $dirname);
     return 0 if ($self->{'block_exp'} ne "" && $dirname =~ /$self->{'block_exp'}/);
-    
+
     # check to make sure we're not reading the archives or index directory
     my $gsdlhome = quotemeta($ENV{'GSDLHOME'});
@@ -299 +299 @@
 
     my $subfile = $dir[$i];
+    my $this_file_base_dir = $base_dir;
     last if ($maxdocs != -1 && $count >= $maxdocs);
     next if ($subfile =~ /^\.\.?$/);
     next if ($read_metadata_files && $subfile =~ /metadata\.xml$/);
+
+    # Follow Windows shortcuts
+    if ($subfile =~ /(?i)\.lnk$/ && $ENV{'GSDLOS'} =~ /^windows$/i) {
+        require Win32::Shortcut;
+        my $shortcut = new Win32::Shortcut(&util::filename_cat($dirname, $subfile));
+        if ($shortcut) {
+        # The file to be processed is now the target of the shortcut
+        $this_file_base_dir = "";
+        $file = "";
+        $subfile = $shortcut->Path;
+        }
+    }
 
     # check for a symlink pointing back to a leading directory
@@ -345 +358 @@
     print $outhandle "RecPlug recurring: $subfile\n" if ($verbosity > 2);
 
-    $count += &plugin::read ($pluginfo, $base_dir, 
+    $count += &plugin::read ($pluginfo, $this_file_base_dir, 
                  &util::filename_cat($file, $subfile),
                  $out_metadata, $processor, $maxdocs, $gli);