Skip to content

return when error is encountered #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
arun3688 wants to merge 1 commit into from
Closed

return when error is encountered #202

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions OMPython/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,14 +895,14 @@ def loadLibrary(self, verbose):
if element.endswith(".mo"):
loadModelResult = self.requestApi("loadFile", element)
if not loadModelResult:
loadmodelError = self.requestApi('getErrorString')
return print(self.getconn.sendExpression("getErrorString()"))
## always print the notification warning to user, to suppress the warnings add verbose=False
if verbose:
print(self.requestApi('getErrorString'))
else:
loadModelResult = self.requestApi("loadModel", element)
if not loadModelResult:
loadmodelError = self.requestApi('getErrorString')
return print(self.getconn.sendExpression("getErrorString()"))
if verbose:
print(self.requestApi('getErrorString'))

Expand All @@ -913,7 +913,7 @@ def loadLibrary(self, verbose):
libname = "".join(["loadModel(", element[0], ", ", "{", "\"", element[1], "\"", "}", ")"])
loadModelResult = self.sendExpression(libname)
if not loadModelResult:
loadmodelError = self.sendExpression("getErrorString()")
return print(self.getconn.sendExpression("getErrorString()"))
if verbose:
print(self.requestApi('getErrorString'))
else:
Expand Down Expand Up @@ -942,14 +942,13 @@ def buildModel(self, variableFilter=None, verbose=True):
# print(varFilter)
# buildModelResult=self.getconn.sendExpression("buildModel("+ mName +")")
buildModelResult = self.requestApi("buildModel", self.modelName, properties=varFilter)
buildModelError = self.requestApi("getErrorString")

if ('' in buildModelResult):
print(buildModelError)
return print(self.getconn.sendExpression("getErrorString()"))

# Issue #145. Always print the getErrorString since it might contains build warnings.
if verbose:
print(buildModelError)
print(self.getconn.sendExpression("getErrorString()"))

self.xmlFile=os.path.join(os.path.dirname(buildModelResult[0]),buildModelResult[1]).replace("\\","/")
self.xmlparse()
Expand Down