projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'admin-configure-atom-keys' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
xml
/
xml.ex
diff --git
a/lib/pleroma/web/xml/xml.ex
b/lib/pleroma/web/xml/xml.ex
index 63580c1f87a96b6ef794643c351e03bafa227f6a..df50aac9c027aebb737c7b09a9b427a9321012fc 100644
(file)
--- a/
lib/pleroma/web/xml/xml.ex
+++ b/
lib/pleroma/web/xml/xml.ex
@@
-1,27
+1,44
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.XML do
require Logger
defmodule Pleroma.Web.XML do
require Logger
- def string_from_xpath(xpath, :error), do: nil
+ def string_from_xpath(_, :error), do: nil
+
def string_from_xpath(xpath, doc) do
def string_from_xpath(xpath, doc) do
- {:xmlObj, :string, res} = :xmerl_xpath.string('string(#{xpath})', doc)
+ try do
+ {:xmlObj, :string, res} = :xmerl_xpath.string('string(#{xpath})', doc)
- res = res
- |> to_string
- |> String.trim
+ res =
+ res
+ |> to_string
+ |> String.trim()
- if res == "", do: nil, else: res
+ if res == "", do: nil, else: res
+ catch
+ _e ->
+ Logger.debug("Couldn't find xpath #{xpath} in XML doc")
+ nil
+ end
end
def parse_document(text) do
try do
end
def parse_document(text) do
try do
- {doc, _rest} = text
- |> :binary.bin_to_list
- |> :xmerl_scan.string
+ {doc, _rest} =
+ text
+ |> :binary.bin_to_list()
+ |> :xmerl_scan.string(quiet: true)
doc
doc
+ rescue
+ _e ->
+ Logger.debug("Couldn't parse XML: #{inspect(text)}")
+ :error
catch
catch
- :exit, error ->
- Logger.debug("Couldn't parse
xml
: #{inspect(text)}")
+ :exit,
_
error ->
+ Logger.debug("Couldn't parse
XML
: #{inspect(text)}")
:error
end
end
:error
end
end