equal
deleted
inserted
replaced
2747 # ------------------------------------------------------------------------------- |
2747 # ------------------------------------------------------------------------------- |
2748 # Search in Current Project Functions |
2748 # Search in Current Project Functions |
2749 # ------------------------------------------------------------------------------- |
2749 # ------------------------------------------------------------------------------- |
2750 |
2750 |
2751 def SearchInProject(self, criteria): |
2751 def SearchInProject(self, criteria): |
2752 return self.Project.Search(criteria) |
2752 project_matches = self.Project.Search(criteria) |
|
2753 ctn_matches = self.CTNSearch(criteria) |
|
2754 return project_matches + ctn_matches |
2753 |
2755 |
2754 def SearchInPou(self, tagname, criteria, debug=False): |
2756 def SearchInPou(self, tagname, criteria, debug=False): |
2755 pou = self.GetEditedElement(tagname, debug) |
2757 pou = self.GetEditedElement(tagname, debug) |
2756 if pou is not None: |
2758 if pou is not None: |
2757 search_results = pou.Search(criteria, [tagname]) |
2759 search_results = pou.Search(criteria, [tagname]) |