Skip to content

Commit d33e801

Browse files
committed
XML output
1 parent c85adb2 commit d33e801

2 files changed

Lines changed: 25 additions & 9 deletions

File tree

‎language_tool/__init__.py‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,21 @@ def spell_checking_rules(self):
221221
"MORFOLOGIK_RULE_" + self.language.replace("-", "_").upper()}
222222

223223
def check(self, text: str, srctext=None) -> [Match]:
224-
"""Tokenize the text into sentences and match those sentences
225-
against all currently active rules.
224+
"""Match text against enabled rules.
226225
"""
226+
root = self._get_root(self.url, self._encode(text, srctext))
227+
return [Match(e.attrib, text) for e in root]
228+
229+
def check_api(self, text: str, srctext=None) -> bytes:
230+
"""Match text against enabled rules.
231+
232+
Return result in XML format.
233+
"""
234+
root = self._get_root(self.url, self._encode(text, srctext))
235+
return (b'<?xml version="1.0" encoding="UTF-8"?>\n' +
236+
ElementTree.tostring(root) + b"\n")
237+
238+
def _encode(self, text, srctext=None):
227239
params = {"language": self.language, "text": text.encode("utf-8")}
228240
if srctext is not None:
229241
params["srctext"] = srctext.encode("utf-8")
@@ -233,9 +245,7 @@ def check(self, text: str, srctext=None) -> [Match]:
233245
params["disabled"] = ",".join(self.disabled)
234246
if self.enabled is not None:
235247
params["enabled"] = ",".join(self.enabled)
236-
data = urllib.parse.urlencode(params).encode()
237-
root = self._get_root(self.url, data)
238-
return [Match(e.attrib, text) for e in root]
248+
return urllib.parse.urlencode(params).encode()
239249

240250
def correct(self, text: str, srctext=None) -> str:
241251
"""Automatically apply suggestions to the text.

‎language_tool/__main__.py‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ def parse_args():
3030
help="list of rule IDs to be disabled")
3131
parser.add_argument("--enable", metavar="RULES", type=get_rules,
3232
help="list of rule IDs to be enabled")
33+
parser.add_argument("--api", action="store_true",
34+
help="print results as XML")
3335
parser.add_argument("--version", action="store_true",
3436
help="print LanguageTool version number")
3537
parser.add_argument("--apply", action="store_true",
@@ -77,24 +79,28 @@ def main():
7779
else:
7880
text = get_text(file, encoding)
7981
language = guess_language(text)
80-
print("Detected language: {}".format(language),
81-
file=sys.stderr)
82+
if not args.api:
83+
print("Detected language: {}".format(language),
84+
file=sys.stderr)
8285
if not language:
8386
return 1
8487
lang_tool.language = language
8588
else:
8689
lang_tool.language = args.language
8790

8891
if not guess_language:
89-
print("Language: {}".format(lang_tool.language))
92+
if not args.api:
93+
print("Language: {}".format(lang_tool.language))
9094
text = get_text(file, encoding)
9195

9296
if args.disable is not None:
9397
lang_tool.disable(args.disable)
9498
if args.enable is not None:
9599
lang_tool.enable(args.enable)
96100

97-
if args.apply:
101+
if args.api:
102+
print(lang_tool.check_api(text).decode("utf-8"))
103+
elif args.apply:
98104
print(lang_tool.correct(text))
99105
else:
100106
print()

0 commit comments

Comments
 (0)