openlp-core team mailing list archive

[Armin Köhler <orangeshirt@xxxxxx>]

Armin Köhler has proposed merging lp:~orangeshirt/openlp/foilpresenterimport into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~orangeshirt/openlp/foilpresenterimport/+merge/51407

adapt regex
define author_temp again
-- 
https://code.launchpad.net/~orangeshirt/openlp/foilpresenterimport/+merge/51407
Your team OpenLP Core is requested to review the proposed merge of lp:~orangeshirt/openlp/foilpresenterimport into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/foilpresenterimport.py'
--- openlp/plugins/songs/lib/foilpresenterimport.py	2011-02-25 17:05:01 +0000
+++ openlp/plugins/songs/lib/foilpresenterimport.py	2011-02-26 08:19:57 +0000
@@ -314,14 +314,15 @@
                     i = 1
                 else:
                     i = 1
+            author_temp = []
             for author in strings:
                 temp = re.split(u',(?=\D{2})|(?<=\D),|\/(?=\D{3,})|(?<=\D);',
                     author)
                 for tempx in temp:
                     author_temp.append(tempx)
                 for author in author_temp:
-                    regex = u'^[\/,;\-\s]+|[\/,;\-\s]+$|'\
-                        '\s*[0-9]{4}\s*[\-\/]?\s*([0-9]{4})?[\/,;\-\s]*$'
+                    regex = u'^[\/,;\-\s\.]+|[\/,;\-\s\.]+$|'\
+                        '\s*[0-9]{4}\s*[\-\/]?\s*([0-9]{4})?[\/,;\-\s\.]*$'
                     author = re.compile(regex).sub(u'', author)
                     author = re.compile(
                         u'[0-9]{1,2}\.\s?J(ahr)?h\.|um\s*$|vor\s*$').sub(u'',