Changeset 24433

Timestamp:

2011-08-19T17:59:27+12:00 (12 years ago)

Author:

davidb

Message:

Extracted metadata now has explicit 'ex.' in front

File:

• gs2-extensions/music-ir-src/trunk/perllib/plugins/MusicIRPlugin.pm (modified) (5 diffs)

gs2-extensions/music-ir-src/trunk/perllib/plugins/MusicIRPlugin.pm

@@ -112 +112 @@
     my ($pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli) = @_;
 
-
     my $outhandle = $self->{'outhandle'};
     my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file);
+
+    my $top_section = $doc_obj->get_top_section();
 
     if ($self->{'compute_mir_features'} eq "true")
@@ -124 +125 @@
     my ($features_ext) = ($features_filename =~ m/\.([^.]+)$/);
 
-    my $top_section = $doc_obj->get_top_section();
     
     my $mime_type = ($features_ext eq "arff") ? "text/plain" : "text/xml";
@@ -135 +135 @@
     #we have no text - adds dummy text and NoText metadata
     $self->add_dummy_text($doc_obj, $doc_obj->get_top_section());
+
+    $doc_obj->associate_file($filename_full_path, "audio.mp3", "audio/mpeg", $top_section);
 
     return 1;
@@ -149 +151 @@
     if ($self->{'retrieve_mir_metadata'} eq "true") {
     my $top_section = $doc_obj->get_top_section();
-    my $id3_titles = $doc_obj->get_metadata($top_section,"ID3.Title");
+    my $id3_titles = $doc_obj->get_metadata($top_section,"ex.ID3.Title");
 
     my $id3_title = shift @$id3_titles || "Unknown";
 
-    my $id3_artists = $doc_obj->get_metadata($top_section,"ID3.Artist");
+    my $id3_artists = $doc_obj->get_metadata($top_section,"ex.ID3.Artist");
     my $id3_artist = shift @$id3_artists || "Unkown";
 
@@ -163 +165 @@
     }
 
-
+    $doc_obj->associate_file($metadata_acexml_filename, "jsongminer.xml", 
+                 "text/xml", $top_section);
     }