Changeset 24432 for gs2-extensions/music-ir-src

Timestamp:

2011-08-19T17:58:42+12:00 (13 years ago)

Author:

davidb

Message:

Fix to parsing of returned metadata stored. Bracketed terms could include newline character. Need regexp that uses '/s'

File:

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

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

@@ -88 +88 @@
     # ARG 1: $to_decode is the string to URL decode
     my ($to_decode) = @_;
-    return uri_unescape($to_decode);
+    my $decoded= uri_unescape($to_decode);
+
+    return $decoded;
 }
 
@@ -108 +110 @@
 
         $md_name =~ s/\+//g;
-        $md_value =~ s/\+//g;
+        $md_value =~ s/\+/ /g;
         
         $md_name = urlDecode($md_name);
         $md_value = urlDecode($md_value);
 
-        # $md_name =~ s/\s+//g;
-        $md_name =~ s/\(.*?\)$//;
+        # $md_name =~ s/\s+/ /sg;
+        $md_name =~ s/\(.*?\)$//s; # can stretch over multiple lines
         $md_name =~ s/Last\.FM/LastFM/g;
         $md_name =~ s/:/^/g;
         $md_name =~ s/(API)?\^/./;
 
-        $doc_obj->add_metadata($top_section,$md_name,$md_value);
+        $doc_obj->add_utf8_metadata($top_section,$md_name,$md_value);
     }
 
@@ -179 +181 @@
     $jsongminer_cmd .= " -artist \"$id3_artist\"";
     $jsongminer_cmd .= " -audio \"$source_file_path\"";
-    $jsongminer_cmd .= " -savefile \"$target_txt_file_path\"";
-##  $jsongminer_cmd .= " -saveacefile \"$target_acexml_file_path\"";
+    $jsongminer_cmd .= " -savetxtfile \"$target_txt_file_path\"";
+    $jsongminer_cmd .= " -saveacexmlfile \"$target_acexml_file_path\"";
     
     if ($verbosity>2) {