Merge branch 'master' into development

Kuytu/Zemberek_Runner.py

@@ -23,54 +23,47 @@ def fixZemberekOutput(zemberek_output_path):
                     fs.append('None')
                     ss.append('None')  
                     continue
-
-                line_parts = line.strip().split('#')
 
+                line_parts = line.strip().split('#')
                 first_sentence = line_parts[0]
                 second_sentence = 'None'
-                sentences = {}
                 d_flag = False
                 o_flag = False
-                lngth = len(line_parts)
-                try:
-                    for j, part in enumerate(line_parts):
-
-                        try:
-                            if part.endswith('o.') and o_flag == False:
-                                first_sentence += line_parts[j+1]
-                                o_flag = True
-
-                            if d_flag == True:
-                                if o_flag == True:
-                                    try:
-                                        second_sentence = line_parts[3]
-                                    except:
-                                        second_sentence = 'None'
-                                else:
-                                    try:
-                                        second_sentence = line_parts[2]
-                                    except:
-                                        second_sentence = 'None'
-
-                            if part.endswith('(d.') and d_flag == False:
-                                first_sentence = line_parts[j] + " " + line_parts[j+1]
-                                d_flag = True
-                        except Exception as e:
-                            if '(d.' not in part:
-                                first_sentence = line_parts[1]
+                for j, part in enumerate(line_parts):
+                    try:
+                        if (part.endswith('o.') or part.endswith('ö.')) and o_flag == False:
+                            first_sentence += line_parts[j+1]
+                            o_flag = True
+
+                        if d_flag == True:
+                            if o_flag == True:
+                                try:
+                                    second_sentence = line_parts[3]
+                                except:
+                                    second_sentence = 'None'
                             else:
-                                first_sentence = 'None-Faulty'
-                except Exception as e:
-                    fs.append('None')
-                    ss.append('None')  
-                    continue                                                    
+                                try:
+                                    second_sentence = line_parts[2]
+                                except:
+                                    second_sentence = 'None'
+
+                        if (part.endswith('(d.') or part.endswith('(d.?') or part.endswith('(d. ?')) and d_flag == False:
+                            first_sentence = line_parts[j] + " " + line_parts[j+1]
+                            d_flag = True
+                    except:
+                        pass
+
+                if d_flag == False and o_flag == False and (len(line_parts)>1):
+                    second_sentence = line_parts[1]
 
                 fs.append(first_sentence)
                 ss.append(second_sentence)                    
-                #print '\n1. ', first_sentence, '\n2. ',second_sentence, '\n'       
+                #print '\n1. ', first_sentence, '\n2. ',second_sentence, '\n'     
+
         f.close()
         return fs,ss
 
+
 
     # Start
     set_environment()