Changeset 12961

Timestamp:

2006-10-01T12:12:31+13:00 (18 years ago)

Author:

kjdon

Message:

added a new option to ConvertToPlug: -keep_original_filename. The original fileanme will be used for the assocaited file rather than doc,pdf, doc.doc etc

Location:

trunk/gsdl/perllib

Files:

• plugins/ConvertToPlug.pm (modified) (3 diffs)
• strings.properties (modified) (1 diff)

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -62 +62 @@
     'list' => $convert_to_list, 
     'deft' => "auto" },
+      { 'name' => "keep_original_filename",
+    'desc' => "{ConvertToPlug.keep_original_filename}",
+    'type' => "flag" },
       { 'name' => "title_sub",
     'desc' => "{HTMLPlug.title_sub}",
@@ -459 +462 @@
     my $cursection = $doc_obj->get_top_section();
     my $filename = &util::filename_cat($base_dir, $file);
-    $doc_obj->associate_file($filename, "doc.$doc_ext", undef, $cursection);
+    my $assocfilename = "doc.$doc_ext";
+    if ($self->{'keep_original_filename'} == 1) {
+    # this should be the same filename that was used for the Source metadata, as we will use [Source] in the srclink
+    ($assocfilename) = $file =~ /([^\\\/]+)$/;
+    }
+    $doc_obj->associate_file($filename, $assocfilename, undef, $cursection);
 
     my $file_type;
@@ -481 +489 @@
     # We use set instead of add here because we only want one value
     $doc_obj->set_utf8_metadata_element($cursection, "FileFormat", $file_format);
-
     my $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[archivedir]/doc.$doc_ext\">";
+    if ($self->{'keep_original_filename'} == 1) {
+    $doclink = "<a href=\"_httpprefix_/collect/[collection]/index/assoc/[archivedir]/[Source]\">";
+    }
     $doc_obj->add_utf8_metadata ($cursection, "srclink",  $doclink); 
     $doc_obj->add_utf8_metadata ($cursection, "srcicon",  "_icon".$doc_ext."_"); 

trunk/gsdl/perllib/strings.properties

@@ -733 +733 @@
 
 ConvertToPlug.desc:This plugin is inherited by such plugins as WordPlug, PPTPlug, PSPlug, RTFPlug and PDFPlug. It facilitates the conversion of these document types to either HTML, TEXT or a series of images. It works by dynamically loading an appropriate secondary plugin (HTMLPlug, StructuredHTMLPlug, PagedImgPlug or TEXTPlug) based on the plugin argument 'convert_to'. 
-
+ConvertToPlug.keep_original_filename:Keep the original filename for the associated file, rather than converting to doc.pdf, doc.doc etc.
 ConvertToPlug.use_strings:If set, a simple strings function will be called to extract text if the conversion utility fails.