From 2da3a1fb06caf0c7fc53a8efdfbc769278b4323f Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars@erlang.org>
Date: Wed, 16 Nov 2011 15:10:18 +0100
Subject: [erl_docgen] Move files from docbuilder to erl_docgen

---
 lib/erl_docgen/src/docgen_xml_check.erl | 45 +++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 lib/erl_docgen/src/docgen_xml_check.erl

(limited to 'lib/erl_docgen/src/docgen_xml_check.erl')

diff --git a/lib/erl_docgen/src/docgen_xml_check.erl b/lib/erl_docgen/src/docgen_xml_check.erl
new file mode 100644
index 0000000000..5912e22e7b
--- /dev/null
+++ b/lib/erl_docgen/src/docgen_xml_check.erl
@@ -0,0 +1,45 @@
+%% ``The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved via the world wide web at http://www.erlang.org/.
+%% 
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either expressed or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%% 
+%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+%% Portions created by Ericsson are Copyright 1999-2000, Ericsson 
+%% Utvecklings AB. All Rights Reserved.''
+%% 
+%%     $Id$
+%%
+-module(docb_xml_check).
+
+-export([validate/1]).
+-deprecated([{validate,1,next_major_release}]).
+
+%% validate(File) -> ok | error | {error, badfile}
+%%   File = string(), file name with or without ".xml" extension
+%% If XML validation fails for a file, the error information from
+%% Xmerl is printed to terminal and the function returns error.
+validate(File0) ->
+    File = case filename:extension(File0) of
+	       ".xml" -> File0;
+	       _ -> File0++".xml"
+	   end,
+    case filelib:is_regular(File) of
+	true ->
+	    DtdDir = docb_util:dtd_dir(),
+	    case catch xmerl_scan:file(File, [{validation,true},
+					      {fetch_path,[DtdDir]}]) of
+		{'EXIT', Error} ->
+		    io:format("~p~n", [Error]),
+		    error;
+		{_Doc, _Misc} ->
+		    ok
+	    end;
+	false ->
+	    {error, badfile}
+    end.
-- 
cgit v1.2.3


From 013e3840532b16308f4bfcf22bde0e6de8d064b2 Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars@erlang.org>
Date: Fri, 18 Nov 2011 12:39:57 +0100
Subject: [erl_docgen] Add an application ref page

---
 lib/erl_docgen/src/docgen_xml_check.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/erl_docgen/src/docgen_xml_check.erl')

diff --git a/lib/erl_docgen/src/docgen_xml_check.erl b/lib/erl_docgen/src/docgen_xml_check.erl
index 5912e22e7b..892a880269 100644
--- a/lib/erl_docgen/src/docgen_xml_check.erl
+++ b/lib/erl_docgen/src/docgen_xml_check.erl
@@ -15,7 +15,7 @@
 %% 
 %%     $Id$
 %%
--module(docb_xml_check).
+-module(docgen_xml_check).
 
 -export([validate/1]).
 -deprecated([{validate,1,next_major_release}]).
@@ -31,7 +31,7 @@ validate(File0) ->
 	   end,
     case filelib:is_regular(File) of
 	true ->
-	    DtdDir = docb_util:dtd_dir(),
+	    DtdDir = filename:join(code:priv_dir(erl_docgen), "dtd"),
 	    case catch xmerl_scan:file(File, [{validation,true},
 					      {fetch_path,[DtdDir]}]) of
 		{'EXIT', Error} ->
-- 
cgit v1.2.3