From 6b6c46c490fa3391139fbecc4776514bf040cf6d Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Fri, 1 Jan 2016 21:14:55 +0000 Subject: add GetStringWithNoAccents git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3156 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/base/USong.pas | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/base/USong.pas') diff --git a/src/base/USong.pas b/src/base/USong.pas index 041f3853..1dda2825 100644 --- a/src/base/USong.pas +++ b/src/base/USong.pas @@ -135,6 +135,10 @@ type Title: UTF8String; Artist: UTF8String; + // use in search + TitleNoAccent: UTF8String; + ArtistNoAccent: UTF8String; + Creator: UTF8String; CoverTex: TTexture; @@ -787,12 +791,14 @@ begin //Title self.Title := Parser.SongInfo.Header.Title; + self.TitleNoAccent := LowerCase(GetStringWithNoAccents(UTF8Decode(Parser.SongInfo.Header.Title))); //Add Title Flag to Done Done := Done or 1; //Artist self.Artist := Parser.SongInfo.Header.Artist; + self.ArtistNoAccent := LowerCase(GetStringWithNoAccents(UTF8Decode(Parser.SongInfo.Header.Artist))); //Add Artist Flag to Done Done := Done or 2; @@ -968,6 +974,8 @@ begin if (Identifier = 'TITLE') then begin DecodeStringUTF8(Value, Title, Encoding); + self.TitleNoAccent := LowerCase(GetStringWithNoAccents(UTF8Decode(Title))); + //Add Title Flag to Done Done := Done or 1; end @@ -975,6 +983,8 @@ begin else if (Identifier = 'ARTIST') then begin DecodeStringUTF8(Value, Artist, Encoding); + self.ArtistNoAccent := LowerCase(GetStringWithNoAccents(UTF8Decode(Artist))); + //Add Artist Flag to Done Done := Done or 2; end @@ -1073,7 +1083,7 @@ begin DecodeStringUTF8(Value, Language, Encoding) end - //Language Sorting + //Year Sorting else if (Identifier = 'YEAR') then begin TryStrtoInt(Value, self.Year) -- cgit v1.2.3