diff --git a/src/filters/rclimg b/src/filters/rclimg
index 98d5c0fa..116f408e 100755
--- a/src/filters/rclimg
+++ b/src/filters/rclimg
@@ -27,6 +27,7 @@
#
$tagMap = {
'subject' => 'subject',
+ 'comment' => 'description',
'title' => 'title',
'headline' => 'title',
'caption' => 'caption',
@@ -71,17 +72,26 @@ sub imgTagsToHtml {
foreach $tagname ( sort keys %{$info} ) {
$xapiantag = xapianTag($tagname);
if (defined $xapiantag ) {
- push @{$fields}, [ $xapiantag, $info->{$tagname} ];
if ($xapiantag eq 'title') {
- $titleHtmlTag = "$info->{$tagname}";
- }
- push @{$other}, [ $tagname, $info->{$tagname} ] if $headAndBody;
+ if ($titleHtmlTag) {
+ $titleHtmlTag = $titleHtmlTag . " - $info->{$tagname}";
+ } else {
+ $titleHtmlTag = $info->{$tagname};
+ }
+ } else {
+ push @{$fields}, [ $xapiantag, $info->{$tagname} ];
+ }
+ push @{$other}, [ $tagname, $info->{$tagname} ] if $headAndBody;
} else {
push @{$other}, [ $tagname, $info->{$tagname} ];
}
}
- $output = "\n\n$titleHtmlTag\n" .
- "\n";
+ $output = "\n\n";
+ if ($titleHtmlTag) {
+ $output = $output . "" . $titleHtmlTag . "\n";
+ }
+ $output = $output .
+ "\n";
foreach $tagpair ( @{$fields} ) {
($tagname, $value) = @{$tagpair};
$output = $output . "\n";
diff --git a/src/sampleconf/mimeconf b/src/sampleconf/mimeconf
index 103daee2..7e61629a 100644
--- a/src/sampleconf/mimeconf
+++ b/src/sampleconf/mimeconf
@@ -139,6 +139,7 @@ audio/ape = execm rclaudio
audio/mpeg = execm rclaudio
audio/mp4 = execm rclaudio
video/mp4 = execm rclaudio
+video/x-msvideo = execm rclimg
audio/aac = execm rclaudio
audio/x-karaoke = execm rclkar
audio/x-wavpack = execm rclaudio
diff --git a/src/sampleconf/mimemap b/src/sampleconf/mimemap
index e3408765..b5446db2 100644
--- a/src/sampleconf/mimemap
+++ b/src/sampleconf/mimemap
@@ -174,6 +174,7 @@
.ogv = video/ogg
.flv = video/x-flv
.mp4 = video/mp4
+.avi = video/x-msvideo
.ts = video/MP2T
.png = image/png