openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

> Service Song imports matches "Above All Powers" with "1Above All Powers1"  is
> this correct as it should be a different song.

I did not change the algorithm which detects that. However, I added the re.compile code from the re-index tool, to make sure, that the (search) titles are formatted in the same way. In addition, I added strip() to make sure that there are no white spaces.
Can you test the import with trunk, to make sure this problem is only in this branch?

Superfly:
I merged the classes as you requested.

Furthermore, I removed the lang="" attribute from the lyrics tag, because this is not like OpenLyrics does this, and as we do not use this attribute right now I removed it. It should be added back to the <verse> tag instead, which is necessary to support multiple languages for songs. But as we have to remove the wrong attribute in the lyrics tag (re-index tool) as well, I did not add it, because this would be much for this proposal.
-- 
https://code.launchpad.net/~googol-hush/openlp/OpenLyrics/+merge/45620
Your team OpenLP Core is subscribed to branch lp:openlp.