Changeset 23362 for main/trunk/greenstone2/perllib/doc.pm

Timestamp:

2010-12-01T11:40:36+13:00 (13 years ago)

Author:

davidb

Message:

Additional routines (and few upgraded) to help support Greenstone working with filenames under Windows when then go beyond Latin-1 and start turning up in their DOS abbreviated form (e.g. Test~1.txt)

File:

• main/trunk/greenstone2/perllib/doc.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/doc.pm

@@ -64 +64 @@
     # the docsave processor now calls set_lastmodified
 
-    $self->{'source_path'} = $source_filename;
+    $self->set_source_path($source_filename);
     
     if (defined $source_filename) {
@@ -76 +76 @@
     return $self;
 }
+
+
+sub set_source_path
+{
+    my $self = shift @_;
+    my ($source_filename) = @_;
+
+    if (defined $source_filename) {
+    # On Windows the source_filename can be in terse DOS format
+    # e.g. test~1.txt
+
+    $self->{'terse_source_path'} = $source_filename;
+
+    if (-e $source_filename) {
+        # See if we can do better for Windows with a filename
+        if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+        require Win32;
+        $self->{'source_path'} = Win32::GetLongPathName($source_filename);
+        }
+        else {
+        # For Unix-based systems, there is no difference between the two
+        $self->{'source_path'} = $source_filename;
+        }
+    }
+    else {
+        print STDERR "Warning: In doc::set_source_path(), file\n";
+        print STDERR "           $source_filename\n";
+        print STDERR "         does not exist\n";
+        
+        # (default) Set it to whatever we were given
+        $self->{'source_path'} = $source_filename;
+    }   
+    }
+    else {
+    # Previous code for setting source_path allowed for
+    # it to be undefined, so continue this practice
+    $self->{'terse_source_path'} = undef;
+    $self->{'source_path'} = undef;
+    }
+}
+
+
+sub get_source_path
+{
+    my $self = shift @_;
+
+    return $self->{'terse_source_path'};
+}
+
 # set lastmodified for OAI purposes, added by GRB, moved by kjdon
 sub set_lastmodified {
     my $self = shift (@_);
 
-    my $source_path = $self->{'source_path'};
+    my $source_path = $self->{'terse_source_path'};
    
     if (defined $source_path && (-e $source_path)) {
@@ -207 +256 @@
     my $self = shift (@_);
 
-    return $self->{'source_path'};
+    return $self->{'terse_source_path'};
 }