Improve stability of WFA module: catch more error types

This commit is contained in:
Némunaire 2012-07-06 10:51:08 +02:00
parent bb4fe1a8fe
commit 2e8e58a4a1

View File

@ -29,11 +29,31 @@ class WFASearch:
def error(self): def error(self):
if self.wfares["error"] == "true": if self.wfares["error"] == "true":
return "An error occurs during computation: " + self.wfares.getNode("error").getNode("msg").getContent() return "An error occurs during computation: " + self.wfares.getNode("error").getNode("msg").getContent()
elif self.wfares.hasNode("didyoumeans"):
start = "Did you mean: "
tag = "didyoumean"
end = "?"
elif self.wfares.hasNode("tips"):
start = "Tips: "
tag = "tip"
end = ""
elif self.wfares.hasNode("relatedexamples"):
start = "Related examples: "
tag = "relatedexample"
end = ""
elif self.wfares.hasNode("futuretopic"):
return self.wfares.getNode("futuretopic")["msg"]
else: else:
return "An error occurs during computation"
proposal = list() proposal = list()
for dym in self.wfares.getNode("didyoumeans").getNodes("didyoumean"): for dym in self.wfares.getNode(tag + "s").getNodes(tag):
if tag == "tip":
proposal.append(dym["text"])
elif tag == "relatedexample":
proposal.append(dym["desc"])
else:
proposal.append(dym.getContent()) proposal.append(dym.getContent())
return "Did you mean: " + ', '.join(proposal) + "?" return start + ', '.join(proposal) + end
@property @property
def nextRes(self): def nextRes(self):