Changeset 23278 for main/trunk

Timestamp:

2010-11-03T10:45:43+13:00 (13 years ago)

Author:

kjdon

Message:

split out the encoding filename bit from set_source_metadata so that other places can use it

File:

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

main/trunk/greenstone2/perllib/doc.pm

@@ -167 +167 @@
 
     # URLencode just the gsdl_source_filename, not the directory. Then prepend dir 
-    my ($srcfilename,$dirname,$suffix) 
-    = &File::Basename::fileparse($source_filename, "\\.[^\\.]+\$");
+    $source_filename = $self->encode_filename($source_filename, $rename_method);
+#    my ($srcfilename,$dirname,$suffix) 
+#   = &File::Basename::fileparse($source_filename, "\\.[^\\.]+\$");
 #    print STDERR "-> $srcfilename -> ";
-    $srcfilename = &util::rename_file($srcfilename.$suffix, $rename_method);
-    $source_filename = &util::filename_cat($dirname, $srcfilename);
+#    $srcfilename = &util::rename_file($srcfilename.$suffix, $rename_method);
+#    $source_filename = &util::filename_cat($dirname, $srcfilename);
 #    print STDERR "$source_filename\n";
     
@@ -177 +178 @@
                  "gsdlsourcefilename", 
                  $source_filename);
+}
+
+sub encode_filename {
+    my $self = shift (@_);
+    my ($source_filename, $rename_method) = @_;
+
+     my ($srcfilename,$dirname,$suffix) 
+    = &File::Basename::fileparse($source_filename, "\\.[^\\.]+\$");
+#    print STDERR "-> $srcfilename -> ";
+    $srcfilename = &util::rename_file($srcfilename.$suffix, $rename_method);
+    $source_filename = &util::filename_cat($dirname, $srcfilename);
+
+    return $source_filename;
 }