Changeset 8519

Timestamp:

2004-11-11T15:51:11+13:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed the extra Title metadata problem with David's help.

Location:

trunk/gsdl/perllib/plugins

Files:

• MP3Plug.pm (modified) (5 diffs)
• UnknownPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/plugins/MP3Plug.pm

@@ -186 +186 @@
         
         $doc_obj->add_metadata ($section, $mp3_metaname, $mp3_metavalue);
-        if ($mp3_metaname eq "mp3:Title") {
-            $doc_obj->add_metadata ($section, "Title", $mp3_metavalue);
-        }
         }
     }
@@ -217 +214 @@
             
             $doc_obj->add_metadata ($section, $mp3t_metaname, $mp3t_metavalue);
-            if ($mp3t_metaname eq "mp3:Title") {
-            $doc_obj->add_metadata ($section, "Title", $mp3t_metavalue);
-            }
         }
         }
@@ -226 +220 @@
     }
 
-    $self->title_fallback($doc_obj,$section,$file);
     $doc_obj->add_metadata ($section, "FileFormat", "MP3");
     
@@ -352 +345 @@
     $self->extra_metadata ($doc_obj, $section, $metadata);
 
+    $self->title_fallback($doc_obj,$section,$file);
+
     # do plugin specific processing of doc_obj
     return undef unless defined ($self->process (\$text, $pluginfo, $base_dir, 
@@ -371 +366 @@
 
 
+sub title_fallback
+{
+    my $self = shift (@_);
+    my ($doc_obj,$section,$file) = @_;
+
+    if (!defined $doc_obj->get_metadata_element ($section, "Title")) {
+    my $mp3_title = $doc_obj->get_metadata_element ($section, "mp3:Title");
+    if (defined $mp3_title) {
+        $doc_obj->add_metadata ($section, "Title", $mp3_title);
+    }
+    else {
+        &BasPlug::title_fallback($self, $doc_obj, $section, $file);
+    }
+    }
+}
+
 
 1;

trunk/gsdl/perllib/plugins/UnknownPlug.pm

@@ -142 +142 @@
     $doc_obj->add_metadata ($section, "FileFormat", $file_format);
     $doc_obj->add_metadata ($section, $assoc_field, $file);
-
-    $self->title_fallback($doc_obj,$section,$file);
     
     $doc_obj->add_metadata ($section, "srclink", 
@@ -205 +203 @@
     $self->extra_metadata ($doc_obj, $section, $metadata);
 
+    $self->title_fallback($doc_obj,$section,$file);
+
     # do plugin specific processing of doc_obj
     return -1 unless defined ($self->process (\$text, $pluginfo, $base_dir,