Permalink
Browse files

EIT: Update Fixup for Norway.

1) Don't require a space before seeing (R) when setting the repeat flag.
2) Allow either acceptable spelling with -on/en and -er/ar suffixes.

I checked the spellings of each variant and was able to find all of them between a few Norwegian stations (and several of them within NRK itself).

Patch by Hakon, Thanks, and fixes #9848.
  • Loading branch information...
1 parent 60a0eb0 commit 73e7ff64d17c55a89d221b6fa28859a3908023ae Robert McNamara committed Jun 15, 2011
Showing with 4 additions and 4 deletions.
  1. +4 −4 mythtv/libs/libmythtv/eitfixup.cpp
@@ -112,12 +112,12 @@ EITFixUp::EITFixUp()
m_nlDirector("(?=\\svan\\s)(([A-Z]{1}[a-z]+\\s)|([A-Z]{1}\\.\\s))"),
m_nlCat("^(Amusement|Muziek|Informatief|Nieuws/actualiteiten|Jeugd|Animatie|Sport|Serie/soap|Kunst/Cultuur|Documentaire|Film|Natuur|Erotiek|Comedy|Misdaad|Religieus)\\.\\s"),
m_nlOmroep ("\\s\\(([A-Z]+/?)+\\)$"),
- m_noRerun(" \\(R\\)"),
+ m_noRerun("\\(R\\)"),
m_noColonSubtitle("^([^:]+): (.+)"),
- m_noNRKCategories("^(Superstreker|Supersommer|Superjul|Barne-tv|Fantorangen|Kuraffen|Supermorgen|Julemorgen|Sommermorgen|"
+ m_noNRKCategories("^(Superstrek[ea]r|Supersomm[ea]r|Superjul|Barne-tv|Fantorangen|Kuraffen|Supermorg[eo]n|Julemorg[eo]n|Sommermorg[eo]n|"
"Kuraffen-TV|Sport i dag|NRKs sportsl.rdag|NRKs sportss.ndag|Dagens dokumentar|"
- "NRK2s historiekveld|Detektimen|Nattkino|Filmklassiker|Film|Kortfilm|P.skemorgen|"
- "Radioteatret|Opera|P2-Akademiet|Nyhetsmorgen i P2 og Alltid Nyheter:): (.+)"),
+ "NRK2s historiekveld|Detektimen|Nattkino|Filmklassiker|Film|Kortfilm|P.skemorg[eo]n|"
+ "Radioteatret|Opera|P2-Akademiet|Nyhetsmorg[eo]n i P2 og Alltid Nyheter:): (.+)"),
m_noPremiere("\\s+-\\s+(Sesongpremiere|Premiere|premiere)!?$"),
m_Stereo("\\b\\(?[sS]tereo\\)?\\b")

0 comments on commit 73e7ff6

Please sign in to comment.