comparison rdf/RDFFeatureWriter.cpp @ 1144:c8e291700c0e

Write Track in RDF only if title/artist metadata present, not simply on the basis of a TrackMetadata object existing
author Chris Cannam
date Wed, 04 Nov 2015 12:06:12 +0000
parents 26cf6d5251ec
children 87ae75da6527
comparison
equal deleted inserted replaced
1143:d649818fc249 1144:c8e291700c0e
350 QString afURI = url.toEncoded().data(); 350 QString afURI = url.toEncoded().data();
351 if (m_userAudioFileUri != "") afURI = m_userAudioFileUri; 351 if (m_userAudioFileUri != "") afURI = m_userAudioFileUri;
352 352
353 bool wantTrack = (userSpecifiedTrack || 353 bool wantTrack = (userSpecifiedTrack ||
354 (m_userMakerUri != "") || 354 (m_userMakerUri != "") ||
355 (m_metadata.find(trackId) != m_metadata.end())); 355 haveTitleArtistMetadata(trackId));
356 356
357 // cerr << "wantTrack = " << wantTrack << " (userSpecifiedTrack = " 357 // cerr << "wantTrack = " << wantTrack << " (userSpecifiedTrack = "
358 // << userSpecifiedTrack << ", m_userMakerUri = " << m_userMakerUri << ", have metadata = " << (m_metadata.find(trackId) != m_metadata.end()) << ")" << endl; 358 // << userSpecifiedTrack << ", m_userMakerUri = " << m_userMakerUri << ", have metadata = " << (m_metadata.find(trackId) != m_metadata.end()) << ")" << endl;
359 359
360 if (wantTrack) { 360 if (wantTrack) {
365 // be a fragment, a test file, whatever. Since we'd have no 365 // be a fragment, a test file, whatever. Since we'd have no
366 // metadata to associate with our Track, the only effect of 366 // metadata to associate with our Track, the only effect of
367 // including a Track would be to assert that this was one, 367 // including a Track would be to assert that this was one,
368 // which is the one thing we wouldn't know... 368 // which is the one thing we wouldn't know...
369 TrackMetadata tm; 369 TrackMetadata tm;
370 if (m_metadata.find(trackId) != m_metadata.end()) { 370 if (haveTitleArtistMetadata(trackId)) {
371 tm = m_metadata[trackId]; 371 tm = m_metadata[trackId];
372 } 372 }
373 stream << trackURI << " a mo:Track "; 373 stream << trackURI << " a mo:Track ";
374 if (tm.title != "") { 374 if (tm.title != "") {
375 stream << ";\n dc:title \"\"\"" << tm.title << "\"\"\" "; 375 stream << ";\n dc:title \"\"\"" << tm.title << "\"\"\" ";