diff --git a/工具v4/database_tools_2.py b/工具v4/database_tools_2.py index e38d6c67..5b87aab1 100644 --- a/工具v4/database_tools_2.py +++ b/工具v4/database_tools_2.py @@ -2483,7 +2483,7 @@ def SubstringOccurence(regex,string): #生成regex在string中出现的所有位 poslist = [item.start() for item in re.finditer(regex,string)] return poslist -def select_grade_from_pro_dict(prodict,grades): +def select_grade_from_pro_dict(prodict,grades): #grades是一个list if len(grades) == 0: return prodict else: diff --git a/工具v4/单人讲义生成.py b/工具v4/单人讲义生成.py index 4a5c431e..1e21b5f0 100644 --- a/工具v4/单人讲义生成.py +++ b/工具v4/单人讲义生成.py @@ -74,7 +74,8 @@ class MyWindow_drsc(QWidget,Ui_Form): structures_dict = load_structures_dict_from_mariadb(mycursor) raw_pro_dict,obj_dict,bn_dict,unit_obj_dict = generateDictsfromMariaDB(mycursor) if self.radioButton_teacher.isChecked() and self.checkBox_usages.isChecked() and not self.lineEdit_class.text().strip() == "": - grades = self.lineEdit_class.text().strip().split(",") + grades = RefinePunctuations(self.lineEdit_class.text().strip()).split(",") + grades = [g.strip() for g in grades] else: grades = [] pro_dict = select_grade_from_pro_dict(raw_pro_dict,grades) diff --git a/工具v4/系列讲义生成.py b/工具v4/系列讲义生成.py index f60aa5aa..a44ab817 100644 --- a/工具v4/系列讲义生成.py +++ b/工具v4/系列讲义生成.py @@ -85,7 +85,8 @@ class MyWindow_jysc(QWidget,Ui_Form): structures_dict = load_structures_dict_from_mariadb(mycursor) raw_pro_dict,obj_dict,bn_dict,unit_obj_dict = generateDictsfromMariaDB(mycursor) if self.radioButton_teacher.isChecked() and self.checkBox_usages.isChecked() and not self.lineEdit_grades.text().strip() == "": - grades = self.lineEdit_grades.text().strip().split(",") + grades = RefinePunctuations(self.lineEdit_grades.text().strip()).split(",") + grades = [g.strip() for g in grades] else: grades = [] pro_dict = select_grade_from_pro_dict(raw_pro_dict,grades)