[sr-dev] git:master: xmlops Updating xml formats
Olle E. Johansson
oej at edvina.net
Sat Jan 19 22:35:39 CET 2013
Module: sip-router
Branch: master
Commit: 396de50105c29c102da1afb9fabe8ea1324a7282
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=396de50105c29c102da1afb9fabe8ea1324a7282
Author: Olle E. Johansson <oej at edvina.net>
Committer: Olle E. Johansson <oej at edvina.net>
Date: Sat Jan 19 19:57:50 2013 +0100
xmlops Updating xml formats
---
modules/xmlops/README | 7 +--
modules/xmlops/doc/xmlops.xml | 3 +-
modules/xmlops/doc/xmlops_admin.xml | 64 +++++++++++++++++++++++++++++++
modules/xmlops/doc/xmlops_functions.xml | 29 --------------
modules/xmlops/doc/xmlops_params.xml | 41 --------------------
5 files changed, 68 insertions(+), 76 deletions(-)
diff --git a/modules/xmlops/README b/modules/xmlops/README
index 0e1a1f4..b8353b4 100644
--- a/modules/xmlops/README
+++ b/modules/xmlops/README
@@ -40,6 +40,7 @@ Daniel-Constantin Mierla
3.1. buf_size (integer)
3.2. xml_ns (str)
+ 3.3. Pseudo-Variables
3.1. buf_size (integer)
@@ -62,11 +63,9 @@ modparam("xmlops", "buf_size", 8192)
modparam("xmlops", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid")
...
-4. Pseudo-Variables
+3.3. Pseudo-Variables
- 4.1. $xml(name=>spec)
-
-4.1. $xml(name=>spec)
+3.3. Pseudo-Variables
Pseudo-variable for XML document operations using xpath syntax. For
more see the Pseudo-Variables Cookbook.
diff --git a/modules/xmlops/doc/xmlops.xml b/modules/xmlops/doc/xmlops.xml
index 1917a8e..211eca9 100644
--- a/modules/xmlops/doc/xmlops.xml
+++ b/modules/xmlops/doc/xmlops.xml
@@ -59,8 +59,7 @@
</section>
</section>
- <xi:include href="xmlops_params.xml"/>
- <xi:include href="xmlops_functions.xml"/>
+ <xi:include href="xmlops_admin.xml"/>
</book>
diff --git a/modules/xmlops/doc/xmlops_admin.xml b/modules/xmlops/doc/xmlops_admin.xml
new file mode 100644
index 0000000..e076a52
--- /dev/null
+++ b/modules/xmlops/doc/xmlops_admin.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<section id="xmlops.parameters" xmlns:xi="http://www.w3.org/2001/XInclude">
+ <title>Parameters</title>
+
+ <section id="buf_size">
+ <title><varname>buf_size</varname> (integer)</title>
+ <para>
+ Maximum size of the XML buffer.
+ </para>
+ <para>
+ Default value is 4096.
+ </para>
+ <example>
+ <title>Set <varname>buf_size</varname> parameter</title>
+ <programlisting>
+...
+modparam("xmlops", "buf_size", 8192)
+...
+ </programlisting>
+ </example>
+ </section>
+
+ <section id="xml_ns">
+ <title><varname>xml_ns</varname> (str)</title>
+ <para>
+ Register xml namespace prefix. Parameter value must have the format:
+ 'prefix=uri'.</para>
+ <example>
+ <title>Set <varname>xml_ns</varname> parameter</title>
+ <programlisting format="linespecific">
+...
+modparam("xmlops", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid")
+...
+</programlisting>
+ </example>
+ </section>
+
+
+ <section id="pv-xml">
+ <title>Pseudo-Variables</title>
+ <title>
+ <function moreinfo="none">$xml(name=>spec)</function>
+ </title>
+ <para>
+ Pseudo-variable for XML document operations using xpath syntax. For
+ more see the Pseudo-Variables Cookbook.
+ </para>
+ <example>
+ <title><function>xml</function> usage</title>
+ <programlisting format="linespecific">
+...
+$xml(x=>doc)
+ = '<?xml version="1.0" encoding="UTF-8"?><a><b>test</b></a>';
+xlog("content of node b: $xml(x=>xpath:/a/b/text())\n");
+$xml(x=>xpath:/a/b) = "1234";
+...
+</programlisting>
+ </example>
+ </section>
+
+</section>
diff --git a/modules/xmlops/doc/xmlops_functions.xml b/modules/xmlops/doc/xmlops_functions.xml
deleted file mode 100644
index 36daac0..0000000
--- a/modules/xmlops/doc/xmlops_functions.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<section id="textopsx.pvs" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>Pseudo-Variables</title>
-
- <section id="pv-xml">
- <title>
- <function moreinfo="none">$xml(name=>spec)</function>
- </title>
- <para>
- Pseudo-variable for XML document operations using xpath syntax. For
- more see the Pseudo-Variables Cookbook.
- </para>
- <example>
- <title><function>xml</function> usage</title>
- <programlisting format="linespecific">
-...
-$xml(x=>doc)
- = '<?xml version="1.0" encoding="UTF-8"?><a><b>test</b></a>';
-xlog("content of node b: $xml(x=>xpath:/a/b/text())\n");
-$xml(x=>xpath:/a/b) = "1234";
-...
-</programlisting>
- </example>
- </section>
-
-</section>
diff --git a/modules/xmlops/doc/xmlops_params.xml b/modules/xmlops/doc/xmlops_params.xml
deleted file mode 100644
index 2fc947e..0000000
--- a/modules/xmlops/doc/xmlops_params.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<section id="xmlops.parameters" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>Parameters</title>
-
- <section id="buf_size">
- <title><varname>buf_size</varname> (integer)</title>
- <para>
- Maximum size of the XML buffer.
- </para>
- <para>
- Default value is 4096.
- </para>
- <example>
- <title>Set <varname>buf_size</varname> parameter</title>
- <programlisting>
-...
-modparam("xmlops", "buf_size", 8192)
-...
- </programlisting>
- </example>
- </section>
-
- <section id="xml_ns">
- <title><varname>xml_ns</varname> (str)</title>
- <para>
- Register xml namespace prefix. Parameter value must have the format:
- 'prefix=uri'.</para>
- <example>
- <title>Set <varname>xml_ns</varname> parameter</title>
- <programlisting format="linespecific">
-...
-modparam("xmlops", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid")
-...
-</programlisting>
- </example>
- </section>
-
-</section>
More information about the sr-dev
mailing list