Changeset 7693

Timestamp:

2004-07-02T10:08:04+12:00 (20 years ago)

Author:

mdewsnip

Message:

Improvements to the new code so that it works on Windows as well as Unix.

File:

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

trunk/gsdl/perllib/plugins/ISISPlug.pm

@@ -305 +305 @@
         if ($field eq $document_field) {
         my $document_file_full = $document_prefix . $value . $document_suffix;
-        my ($document_file) = ($document_file_full =~ /([^\/]+)$/);
-        if (&obtain_document($self, $document_file_full, $document_file,
-                     $documents_directory)) {
+
+        my $document_file = &obtain_document($self, $document_file_full, $documents_directory);
+        if ($document_file) {
             $document_obtained = 1;
             &write_metadata_xml_file($self->{'documents_metadata_xml_file'},
@@ -367 +367 @@
     my $self = shift(@_);
     my $document_file_full = shift(@_);
-    my $document_file_name = shift(@_);
     my $documents_directory = shift(@_);
-    my $local_document_file = &util::filename_cat($documents_directory, $document_file_name);
 
     my $outhandle = $self->{'outhandle'};
@@ -375 +373 @@
     if ($self->{'verbosity'} > 1);
 
+    my $document_file_name;
+    my $local_document_file;
+
     # Document specified is on the web
     if ($document_file_full =~ /^http:/ || $document_file_full =~ /^ftp:/) {
+    $document_file_full =~ /([^\/]+)$/;
+    $document_file_name = $1;
+    $local_document_file = &util::filename_cat($documents_directory, $document_file_name);
+
     my $wget_options = "--quiet";
     $wget_options = "--verbose" if ($self->{'verbosity'} > 2);
@@ -384 +389 @@
     # Document specified is on the disk
     else {
+    my $dir_sep = &util::get_os_dirsep();
+    $document_file_full =~ /(.+$dir_sep)?(.*)$/;
+    $document_file_name = $2;
+    $local_document_file = &util::filename_cat($documents_directory, $document_file_name);
+
     &util::cp($document_file_full, $documents_directory);
     }
@@ -390 +400 @@
     if (!-e $local_document_file) {
     print STDERR "WARNING: Could not obtain document file $document_file_full\n";
-    return 0;
-    }
-
-    return 1;
+    return undef;
+    }
+
+    return $document_file_name;
 }