minor hack: allow "-erase-" to clear fields

This commit is contained in:
Glenn Maynard
2004-09-02 01:48:11 +00:00
parent 38f5b8d46c
commit 5e4105eee7
+6 -6
View File
@@ -56,21 +56,21 @@ void TitleSubst::Subst( TitleFields &tf )
{ {
if( ttab[i]->translit ) if( ttab[i]->translit )
tf.TitleTranslit = tf.Title; tf.TitleTranslit = tf.Title;
tf.Title = ttab[i]->Dest.Title; tf.Title = (ttab[i]->Dest.Title != "-erase-")? ttab[i]->Dest.Title: "";
FontCharAliases::ReplaceMarkers( tf.Title ); FontCharAliases::ReplaceMarkers( tf.Title );
} }
if( !ttab[i]->Dest.Subtitle.empty() && tf.Subtitle != ttab[i]->Dest.Subtitle ) if( !ttab[i]->Dest.Subtitle.empty() && tf.Subtitle != ttab[i]->Dest.Subtitle )
{ {
if( ttab[i]->translit ) if( ttab[i]->translit )
tf.SubtitleTranslit = tf.Subtitle; tf.SubtitleTranslit = tf.Subtitle;
tf.Subtitle = ttab[i]->Dest.Subtitle; tf.Subtitle = (ttab[i]->Dest.Subtitle != "-erase-")? ttab[i]->Dest.Subtitle: "";
FontCharAliases::ReplaceMarkers( tf.Subtitle ); FontCharAliases::ReplaceMarkers( tf.Subtitle );
} }
if( !ttab[i]->Dest.Artist.empty() && tf.Artist != ttab[i]->Dest.Artist ) if( !ttab[i]->Dest.Artist.empty() && tf.Artist != ttab[i]->Dest.Artist )
{ {
if( ttab[i]->translit ) if( ttab[i]->translit )
tf.ArtistTranslit = tf.Artist; tf.ArtistTranslit = tf.Artist;
tf.Artist = ttab[i]->Dest.Artist; tf.Artist = (ttab[i]->Dest.Artist != "-erase-")? ttab[i]->Dest.Artist: "";
FontCharAliases::ReplaceMarkers( tf.Artist ); FontCharAliases::ReplaceMarkers( tf.Artist );
} }
@@ -78,17 +78,17 @@ void TitleSubst::Subst( TitleFields &tf )
* correct data. Should be used sparingly. */ * correct data. Should be used sparingly. */
if( !ttab[i]->Dest.TitleTranslit.empty() ) if( !ttab[i]->Dest.TitleTranslit.empty() )
{ {
tf.TitleTranslit = ttab[i]->Dest.TitleTranslit; tf.TitleTranslit = (ttab[i]->Dest.TitleTranslit != "-erase-")? ttab[i]->Dest.TitleTranslit: "";
FontCharAliases::ReplaceMarkers( tf.TitleTranslit ); FontCharAliases::ReplaceMarkers( tf.TitleTranslit );
} }
if( !ttab[i]->Dest.SubtitleTranslit.empty() ) if( !ttab[i]->Dest.SubtitleTranslit.empty() )
{ {
tf.SubtitleTranslit = ttab[i]->Dest.SubtitleTranslit; tf.SubtitleTranslit = (ttab[i]->Dest.SubtitleTranslit != "-erase-")? ttab[i]->Dest.SubtitleTranslit: "";
FontCharAliases::ReplaceMarkers( tf.SubtitleTranslit ); FontCharAliases::ReplaceMarkers( tf.SubtitleTranslit );
} }
if( !ttab[i]->Dest.ArtistTranslit.empty() ) if( !ttab[i]->Dest.ArtistTranslit.empty() )
{ {
tf.ArtistTranslit = ttab[i]->Dest.ArtistTranslit; tf.ArtistTranslit = (ttab[i]->Dest.ArtistTranslit != "-erase-")? ttab[i]->Dest.ArtistTranslit: "";
FontCharAliases::ReplaceMarkers( tf.ArtistTranslit ); FontCharAliases::ReplaceMarkers( tf.ArtistTranslit );
} }
} }