beremiz: comparison plcopen/plcopen.py

equal deleted inserted replaced

-:31703a04789a
+:5e64d552b25a
 start = TextLenInRowColumn(text[:result.start()])
 end = TextLenInRowColumn(text[:result.end() - 1])
 test_result.append((start, end, "\n".join(lines[start[0]:end[0] + 1])))
 result = criteria["pattern"].search(text, result.end())
 return test_result
+def TextMatched(str1, str2):
+return str1 and str2 and (str1.upper() == str2.upper())
 PLCOpenParser = GenerateParserFromXSD(os.path.join(os.path.split(__file__)[0], "tc6_xml_v201.xsd"))
 PLCOpen_XPath = lambda xpath: etree.XPath(xpath, namespaces=PLCOpenParser.NSMAP)
 LOAD_POU_PROJECT_TEMPLATE = """
 cls = PLCOpenParser.GetElementClass("formattedText")
 if cls:
 def updateElementName(self, old_name, new_name):
 text = self.getanyText()
-index = text.find(old_name)
+pattern = re.compile('\\b' + old_name + '\\b', re.IGNORECASE)
-while index != -1:
+text = pattern.sub(new_name, text)
-if index > 0 and (text[index - 1].isalnum() or text[index - 1] == "_"):
-index = text.find(old_name, index + len(old_name))
-elif index < len(text) - len(old_name) and (text[index + len(old_name)].isalnum() or text[index + len(old_name)] == "_"):
-index = text.find(old_name, index + len(old_name))
-else:
-text = text[:index] + new_name + text[index + len(old_name):]
-index = text.find(old_name, index + len(new_name))
 self.setanyText(text)
 setattr(cls, "updateElementName", updateElementName)
 def updateElementAddress(self, address_model, new_leading):
 text = self.getanyText()
 result = address_model.search(text, startpos)
 self.setanyText(text)
 setattr(cls, "updateElementAddress", updateElementAddress)
 def hasblock(self, block_type):
-text = self.getanyText().upper()
+text = self.getanyText()
-index = text.find(block_type.upper())
+pattern = re.compile('\\b' + block_type + '\\b', re.IGNORECASE)
-while index != -1:
+return pattern.search(text) is not None
-if (not (index > 0 and (text[index - 1].isalnum() or text[index - 1] == "_")) and
-not (index < len(text) - len(block_type) and text[index + len(block_type)] != "(")):
-return True
-index = text.find(block_type.upper(), index + len(block_type))
-return False
 setattr(cls, "hasblock", hasblock)
 def Search(self, criteria, parent_infos):
 return [(tuple(parent_infos),) + result for result in TestTextElement(self.getanyText(), criteria)]
 setattr(cls, "Search", Search)
 def _updateConfigurationResourceElementName(self, old_name, new_name):
 for varlist in self.getglobalVars():
 for var in varlist.getvariable():
 var_address = var.getaddress()
 if var_address is not None:
-if var_address == old_name:
+if TextMatched(var_address, old_name):
 var.setaddress(new_name)
-if var.getname() == old_name:
+if TextMatched(var.getname(), old_name):
 var.setname(new_name)
 def _updateConfigurationResourceElementAddress(self, address_model, new_leading):
 for varlist in self.getglobalVars():
 for var in varlist.getvariable():
 setattr(cls, "Search", Search)
 cls = PLCOpenParser.GetElementClass("task", "resource")
 if cls:
 def updateElementName(self, old_name, new_name):
-if self.single == old_name:
+if TextMatched(self.single, old_name):
 self.single = new_name
-if self.interval == old_name:
+if TextMatched(self.interval, old_name):
 self.interval = new_name
 for instance in self.getpouInstance():
 instance.updateElementName(old_name, new_name)
 setattr(cls, "updateElementName", updateElementName)
 setattr(cls, "Search", Search)
 cls = PLCOpenParser.GetElementClass("pouInstance")
 if cls:
 def updateElementName(self, old_name, new_name):
-if self.typeName == old_name:
+if TextMatched(self.typeName, old_name):
 self.typeName = new_name
 setattr(cls, "updateElementName", updateElementName)
 def Search(self, criteria, parent_infos=[]):
 return _Search([("name", self.getname()),
 setattr(cls, "getdataTypeElements", getdataTypeElements)
 def getdataTypeElement(self, name):
 elements = self.dataTypes.getdataType()
 for element in elements:
-if element.getname() == name:
+if TextMatched(element.getname(), name):
 return element
 return None
 setattr(cls, "getdataTypeElement", getdataTypeElement)
 def appenddataTypeElement(self, name):
 setattr(cls, "insertdataTypeElement", insertdataTypeElement)
 def removedataTypeElement(self, name):
 found = False
 for element in self.dataTypes.getdataType():
-if element.getname() == name:
+if TextMatched(element.getname(), name):
 self.dataTypes.remove(element)
 found = True
 break
 if not found:
 raise ValueError, _("\"%s\" Data Type doesn't exist !!!")%name
 setattr(cls, "getpouElements", getpouElements)
 def getpouElement(self, name):
 elements = self.pous.getpou()
 for element in elements:
-if element.getname() == name:
+if TextMatched(element.getname(), name):
 return element
 return None
 setattr(cls, "getpouElement", getpouElement)
 def appendpouElement(self, name, pou_type, body_type):
 for element in self.pous.getpou():
-if element.getname() == name:
+if TextMatched(element.getname(), name):
 raise ValueError, _("\"%s\" POU already exists !!!")%name
 new_pou = PLCOpenParser.CreateElement("pou", "pous")
 self.pous.appendpou(new_pou)
 new_pou.setname(name)
 new_pou.setpouType(pou_type)
 setattr(cls, "insertpouElement", insertpouElement)
 def removepouElement(self, name):
 found = False
 for element in self.pous.getpou():
-if element.getname() == name:
+if TextMatched(element.getname(), name):
 self.pous.remove(element)
 found = True
 break
 if not found:
 raise ValueError, _("\"%s\" POU doesn't exist !!!")%name
 setattr(cls, "Search", Search)
 cls = PLCOpenParser.GetElementClass("derived", "dataType")
 if cls:
 def updateElementName(self, old_name, new_name):
-if self.name == old_name:
+if TextMatched(self.name, old_name):
 self.name = new_name
 setattr(cls, "updateElementName", updateElementName)
 def Search(self, criteria, parent_infos=[]):
 return [(tuple(parent_infos),) + result for result in TestTextElement(self.name, criteria)]
 if self.interface is not None:
 content = self.interface.getcontent()
 for varlist in content:
 variables = varlist.getvariable()
 for var in variables:
-if var.getname() == old_name:
+if TextMatched(var.getname(), old_name):
 vartype_content = var.gettype().getcontent()
-if vartype_content.getLocalTag() == "derived" and vartype_content.getname() == old_type:
+if vartype_content.getLocalTag() == "derived" and TextMatched(vartype_content.getname(), old_type):
 var.setname(new_name)
 vartype_content.setname(new_type)
 return
 setattr(cls, "changepouVar", changepouVar)
 def removepouVar(self, var_type, name):
 if self.interface is not None:
 content = self.interface.getcontent()
 for varlist in content:
 for var in varlist.getvariable():
-if var.getname() == name:
+if TextMatched(var.getname(), name):
 vartype_content = var.gettype().getcontent()
-if vartype_content.getLocalTag() == "derived" and vartype_content.getname() == var_type:
+if vartype_content.getLocalTag() == "derived" and TextMatched(vartype_content.getname(), var_type):
 varlist.remove(var)
 if len(varlist.getvariable()) == 0:
 self.interface.remove(varlist)
 break
 setattr(cls, "removepouVar", removepouVar)
 def hasblock(self, name=None, block_type=None):
 if self.getbodyType() in ["FBD", "LD", "SFC"]:
 for instance in self.getinstances():
 if (isinstance(instance, PLCOpenParser.GetElementClass("block", "fbdObjects")) and
-(name and instance.getinstanceName() == name or
+(TextMatched(instance.getinstanceName(), name) or TextMatched(instance.gettypeName(), block_type))):
-block_type and instance.gettypeName() == block_type)):
 return True
 if self.transitions:
 for transition in self.transitions.gettransition():
 result = transition.hasblock(name, block_type)
 if result:
 setattr(cls, "addtransition", addtransition)
 def gettransition(self, name):
 if self.transitions is not None:
 for transition in self.transitions.gettransition():
-if transition.getname() == name:
+if TextMatched(transition.getname(), name):
 return transition
 return None
 setattr(cls, "gettransition", gettransition)
 def gettransitionList(self):
 def removetransition(self, name):
 if self.transitions is not None:
 removed = False
 for transition in self.transitions.gettransition():
-if transition.getname() == name:
+if TextMatched(transition.getname(), name):
 if transition.getbodyType() in ["FBD", "LD", "SFC"]:
 for instance in transition.getinstances():
 if isinstance(instance, PLCOpenParser.GetElementClass("block", "fbdObjects")):
 self.removepouVar(instance.gettypeName(),
 instance.getinstanceName())
 setattr(cls, "addaction", addaction)
 def getaction(self, name):
 if self.actions is not None:
 for action in self.actions.getaction():
-if action.getname() == name:
+if TextMatched(action.getname(), name):
 return action
 return None
 setattr(cls, "getaction", getaction)
 def getactionList(self):
 def removeaction(self, name):
 if self.actions is not None:
 removed = False
 for action in self.actions.getaction():
-if action.getname() == name:
+if TextMatched(action.getname(), name):
 if action.getbodyType() in ["FBD", "LD", "SFC"]:
 for instance in action.getinstances():
 if isinstance(instance, PLCOpenParser.GetElementClass("block", "fbdObjects")):
 self.removepouVar(instance.gettypeName(),
 instance.getinstanceName())
 if self.interface is not None:
 for content in self.interface.getcontent():
 for var in content.getvariable():
 var_address = var.getaddress()
 if var_address is not None:
-if var_address == old_name:
+if TextMatched(var_address, old_name):
 var.setaddress(new_name)
-if var.getname() == old_name:
+if TextMatched(var.getname(), old_name):
 var.setname(new_name)
 var_type_content = var.gettype().getcontent()
 if var_type_content.getLocalTag() == "derived":
-if var_type_content.getname() == old_name:
+if TextMatched(var_type_content.getname(), old_name):
 var_type_content.setname(new_name)
 self.body[0].updateElementName(old_name, new_name)
 for action in self.getactionList():
 action.updateElementName(old_name, new_name)
 for transition in self.gettransitionList():
 def removeVariableByAddress(self, address):
 if self.interface is not None:
 for content in self.interface.getcontent():
 for variable in content.getvariable():
-if variable.getaddress() == address:
+if TextMatched(variable.getaddress(), address):
 content.remove(variable)
 setattr(cls, "removeVariableByAddress", removeVariableByAddress)
 def removeVariableByFilter(self, address_model):
 if self.interface is not None:
 def hasblock(self, name=None, block_type=None):
 if self.getbodyType() in ["FBD", "LD", "SFC"]:
 for instance in self.getinstances():
 if (isinstance(instance, PLCOpenParser.GetElementClass("block", "fbdObjects")) and
-(name and instance.getinstanceName() == name or
+(TextMatched(instance.getinstanceName(), name) or TextMatched(instance.gettypeName(), block_type))):
-block_type and instance.gettypeName() == block_type)):
 return True
 elif block_type is not None:
 return self.body.hasblock(block_type)
 return False
 if (checkedBlocksDict.has_key(connections[0].getrefLocalId()) == False):
 self.compileelementExecutionOrder(connections[0])
 if instance.getexecutionOrderId() == 0:
 instance.setexecutionOrderId(self.getnewExecutionOrderId())
 elif isinstance(instance, PLCOpenParser.GetElementClass("continuation", "commonObjects")) and instance.getexecutionOrderId() == 0:
-name = instance.getname()
 for tmp_instance in self.getcontentInstances():
-if isinstance(tmp_instance, PLCOpenParser.GetElementClass("connector", "commonObjects")) and tmp_instance.getname() == name and tmp_instance.getexecutionOrderId() == 0:
+if (isinstance(tmp_instance, PLCOpenParser.GetElementClass("connector", "commonObjects")) and
+TextMatched(tmp_instance.getname(), instance.getname()) and tmp_instance.getexecutionOrderId() == 0):
 connections = tmp_instance.connectionPointIn.getconnections()
 if connections and len(connections) == 1:
 self.compileelementExecutionOrder(connections[0])
 else:
 raise TypeError, _("Can only generate execution order on FBD networks!")
 bbox.union(_getConnectionsBoundingBox(input.connectionPointIn))
 return bbox
 setattr(cls, "getBoundingBox", getBoundingBox)
 def updateElementName(self, old_name, new_name):
-if self.typeName == old_name:
+if TextMatched(self.typeName, old_name):
 self.typeName = new_name
 setattr(cls, "updateElementName", updateElementName)
 def filterConnections(self, connections):
 for input in self.inputVariables.getvariable():
 _initElementClass("leftPowerRail", "ldObjects")
 _initElementClass("rightPowerRail", "ldObjects", "multiple")
 def _UpdateLDElementName(self, old_name, new_name):
-if self.variable == old_name:
+if TextMatched(self.variable, old_name):
 self.variable = new_name
 def _UpdateLDElementAddress(self, address_model, new_leading):
 self.variable = update_address(self.variable, address_model, new_leading)
 def updateElementName(self, old_name, new_name):
 if self.condition is not None:
 content = self.condition.getcontent()
 content_name = content.getLocalTag()
 if content_name == "reference":
-if content.getname() == old_name:
+if TextMatched(content.getname(), old_name):
 content.setname(new_name)
 elif content_name == "inline":
 content.updateElementName(old_name, new_name)
 setattr(cls, "updateElementName", updateElementName)
 return self.inline.gettext()
 return None
 setattr(cls, "getinlineContent", getinlineContent)
 def updateElementName(self, old_name, new_name):
-if self.reference is not None and self.reference.getname() == old_name:
+if self.reference is not None and TextMatched(self.reference.getname(), old_name):
 self.reference.setname(new_name)
 if self.inline is not None:
 self.inline.updateElementName(old_name, new_name)
 setattr(cls, "updateElementName", updateElementName)
 def _SearchInIOVariable(self, criteria, parent_infos=[]):
 return _Search([("expression", self.expression)], criteria, parent_infos + ["io_variable", self.getlocalId()])
 def _UpdateIOElementName(self, old_name, new_name):
-if self.expression == old_name:
+if TextMatched(self.expression, old_name):
 self.expression = new_name
 def _UpdateIOElementAddress(self, address_model, new_leading):
 self.expression = update_address(self.expression, address_model, new_leading)
 cls = _initElementClass("continuation", "commonObjects")
 if cls:
 setattr(cls, "Search", _SearchInConnector)
 def updateElementName(self, old_name, new_name):
-if self.name == old_name:
+if TextMatched(self.name, old_name):
 self.name = new_name
 setattr(cls, "updateElementName", updateElementName)
 cls = _initElementClass("connector", "commonObjects", "single")
 if cls:
 setattr(cls, "Search", _SearchInConnector)
 def updateElementName(self, old_name, new_name):
-if self.name == old_name:
+if TextMatched(self.name, old_name):
 self.name = new_name
 setattr(cls, "updateElementName", updateElementName)
 cls = PLCOpenParser.GetElementClass("connection")
 if cls:

changeset 1611	5e64d552b25a
parent 1581	2295fdc5c271
child 1616	3638463d6e02