Changeset 18171 for gsdl/trunk/perllib/plugins/BasePlugin.pm

Timestamp:

2008-12-11T10:37:02+13:00 (15 years ago)

Author:

kjdon

Message:

commented out some print statements, fixed up the broken assocfile stuff in extra_metadata

File:

• gsdl/trunk/perllib/plugins/BasePlugin.pm (modified) (7 diffs)

gsdl/trunk/perllib/plugins/BasePlugin.pm

@@ -402 +402 @@
     my $associate_tail_re = $self->{'associate_tail_re'};
     if ((defined $associate_tail_re) && ($associate_tail_re ne "")) {
-    
     my ($file_prefix,$file_ext) 
         = &util::get_prefix_and_tail_by_regex($filename_full_path,$associate_tail_re);
-    
     if ((defined $file_prefix) && (defined $file_ext)) {
         my $shared_fileroot = $block_hash->{'shared_fileroot'};
@@ -545 +543 @@
     }
 
-    print STDERR "**** UTF8 encoding the filename $filemeta ";
+    #print STDERR "**** UTF8 encoding the filename $filemeta ";
     
     # if the filename encoding is set to utf8 but it isn't utf8 already--such as when
@@ -563 +561 @@
     }
 
-    print STDERR " from encoding $filename_encoding -> $filemeta\n";
+    #print STDERR " from encoding $filename_encoding -> $filemeta\n";
     return $filemeta;
 }
@@ -593 +591 @@
     }
 
-    print STDERR "*** filename encoding determined based on locale: " . $self->{'filesystem_encoding'} . "\n";
+    #print STDERR "*** filename encoding determined based on locale: " . $self->{'filesystem_encoding'} . "\n";
     return $self->{'filesystem_encoding'}; # can be the string "undefined"
 }
@@ -1003 +1001 @@
         foreach my $gaf (@{$metadata->{$field}}) {
         my ($full_filename,$mimetype) = ($gaf =~ m/^(.*):(.*):$/);
-        #my ($tail_filename) = ($full_filename =~ /^.*[\/\\](.+?)$/);
-        my $tail_filename = $doc_obj->get_assocfile_from_sourcefile(); 
-        my $filename = $full_filename;
+        my ($tail_filename) = ($full_filename =~ /^.*[\/\\](.+?)$/);
+        
+        # we need to make sure the filename is valid utf-8 - we do 
+        # this by url encoding it
+        # $tail_filename is the name that we store the file as
+        $tail_filename = &unicode::url_encode($tail_filename);
         $doc_obj->associate_file($full_filename,$tail_filename,$mimetype);
-
+        # then we need to encode the % signs in the filename, so that 
+        # it works in a url
+        my $url_tail_filename = &unicode::filename_to_url($tail_filename);
         # work out extended tail extension (i.e. matching tail re)
 
@@ -1013 +1016 @@
             = &util::get_prefix_and_tail_by_regex($tail_filename,$associate_tail_re);
         my ($pre_doc_ext) = ($file_extended_ext =~ m/^(.*)\..*$/);
-
         my ($doc_ext) = ($tail_filename =~ m/^.*\.(.*)$/);
-        my $start_doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/{Or}{[parent(Top):archivedir],[archivedir]}/$tail_filename\">";
+        my $start_doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/{Or}{[parent(Top):archivedir],[archivedir]}/$url_tail_filename\">";
         my $srcicon = "_icon".$doc_ext."_";
         my $end_doclink = "</a>";
@@ -1021 +1023 @@
         my $assoc_form = "$start_doclink\{If\}{$srcicon,$srcicon,$doc_ext\}$end_doclink";
 
-        if (defined $pre_doc_ext) {
+        if (defined $pre_doc_ext && $pre_doc_ext ne "") {
             # for metadata such as [mp3._edited] [mp3._full] ...
             $doc_obj->add_utf8_metadata ($cursection, "$doc_ext.$pre_doc_ext", $assoc_form);