[sr-dev] git:master: modules_k/drouting: Fix previous commit that comes from a broken merge

Module: sip-router Branch: master Commit: 8806c3c19fd7a4423b651310ec1361659034e459 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8806c3c… Author: Raul Alexis Betancor Santana &lt;rabs(a)dimension-virtual.com&gt; Committer: Raul Alexis Betancor Santana &lt;rabs(a)dimension-virtual.com&gt; Date: Sun Jan 3 14:46:21 2010 +0000 modules_k/drouting: Fix previous commit that comes from a broken merge - Fixed .xml files so now they are valid ones. --- lib/srdb1/schema/dr_gateways.xml | 40 +--------------------------- lib/srdb1/schema/dr_groups.xml | 2 +- lib/srdb1/schema/dr_gw_lists.xml | 2 +- lib/srdb1/schema/dr_rules.xml | 45 +------------------------------- lib/srdb1/schema/kamailio-drouting.xml | 10 ------- 5 files changed, 4 insertions(+), 95 deletions(-) diff --git a/lib/srdb1/schema/dr_gateways.xml b/lib/srdb1/schema/dr_gateways.xml index d1c3f4f..e595151 100644 --- a/lib/srdb1/schema/dr_gateways.xml +++ b/lib/srdb1/schema/dr_gateways.xml @@ -9,20 +9,12 @@ <table id="dr_gateways" xmlns:db="http://docbook.org/ns/docbook"> <name>dr_gateways</name> -<<<<<<< HEAD:lib/srdb1/schema/dr_gateways.xml <version>3</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by the Dynamic Routing module to store information about the destinations/gateways where to route calls. - More information can be found at: &OPENSIPS_MOD_DOC;drouting.html. -======= - <version>1</version> - <type db="mysql">&MYSQL_TABLE_TYPE;</type> - <description> - <db:para>This table is used by the douting module - keeps the - gateways data. ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_gateways.xml + More information can be found at: &KAMAILIO_MOD_DOC;drouting.html. </db:para> </description> @@ -33,12 +25,8 @@ <autoincrement/> <primary/> <type db="dbtext">int,auto</type> -<<<<<<< HEAD:lib/srdb1/schema/dr_gateways.xml <description>GW unique ID - used to link the GW from the routing rules -======= - <description>Unique ID per gateway ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_gateways.xml </description> </column> @@ -47,22 +35,14 @@ <type>unsigned int</type> <size>11</size> <default>0</default> -<<<<<<< HEAD:lib/srdb1/schema/dr_gateways.xml <description>Type/class of the GW (user defined)</description> -======= - <description>Type of gateway</description> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_gateways.xml </column> <column id="address"> <name>address</name> <type>string</type> <size>128</size> -<<<<<<< HEAD:lib/srdb1/schema/dr_gateways.xml <description>GW/destination address as name/IP[:port]</description> -======= - <description>Address of gateway (hostname or ip and port)</description> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_gateways.xml </column> <column id="strip"> @@ -70,18 +50,13 @@ <type>unsigned int</type> <size>11</size> <default>0</default> -<<<<<<< HEAD:lib/srdb1/schema/dr_gateways.xml <description>Number of digits to be striped out for the begining of the username when using this GW/destination</description> -======= - <description>Number of digits to strip from dialed number</description> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_gateways.xml </column> <column id="pri_prefix"> <name>pri_prefix</name> <type>string</type> -<<<<<<< HEAD:lib/srdb1/schema/dr_gateways.xml <size>16</size> <null/> <default><null/></default> @@ -97,12 +72,6 @@ <default><null/></default> <description>Generic string describing GW attributes - this string is to be interpreted from the script</description> -======= - <size>64</size> - <null/> - <default><null/></default> - <description>What to prefix to dialed number</description> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_gateways.xml </column> <column id="description"> @@ -110,13 +79,6 @@ <type>string</type> <size>128</size> <default></default> -<<<<<<< HEAD:lib/srdb1/schema/dr_gateways.xml <description>Text description of the GW/destination</description> </column> </table> -======= - <description>Short description of gateway</description> - </column> -</table> - ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_gateways.xml diff --git a/lib/srdb1/schema/dr_groups.xml b/lib/srdb1/schema/dr_groups.xml index 03549e0..fa4d6df 100644 --- a/lib/srdb1/schema/dr_groups.xml +++ b/lib/srdb1/schema/dr_groups.xml @@ -14,7 +14,7 @@ <description> <db:para>This table is used by the Dynamic Routing module to store information about the routing groups (users mapped over groups). - More information can be found at: &OPENSIPS_MOD_DOC;drouting.html. + More information can be found at: &KAMAILIO_MOD_DOC;drouting.html. </db:para> </description> diff --git a/lib/srdb1/schema/dr_gw_lists.xml b/lib/srdb1/schema/dr_gw_lists.xml index e8110e7..7dd4c3e 100644 --- a/lib/srdb1/schema/dr_gw_lists.xml +++ b/lib/srdb1/schema/dr_gw_lists.xml @@ -14,7 +14,7 @@ <description> <db:para>This table is used by the Dynamic Routing module to define lists of gateways to be used in rule definitions. - More information can be found at: &OPENSIPS_MOD_DOC;drouting.html. + More information can be found at: &KAMAILIO_MOD_DOC;drouting.html. </db:para> </description> diff --git a/lib/srdb1/schema/dr_rules.xml b/lib/srdb1/schema/dr_rules.xml index 2c635ce..a114ea7 100644 --- a/lib/srdb1/schema/dr_rules.xml +++ b/lib/srdb1/schema/dr_rules.xml @@ -9,20 +9,12 @@ <table id="dr_rules" xmlns:db="http://docbook.org/ns/docbook"> <name>dr_rules</name> -<<<<<<< HEAD:lib/srdb1/schema/dr_rules.xml <version>3</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by the Dynamic Routing module to store information about the routing rules. - More information can be found at: &OPENSIPS_MOD_DOC;drouting.html. -======= - <version>1</version> - <type db="mysql">&MYSQL_TABLE_TYPE;</type> - <description> - <db:para>This table is used by the drouting module - keeps the - routing rules data. ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_rules.xml + More information can be found at: &KAMAILIO_MOD_DOC;drouting.html. </db:para> </description> @@ -41,12 +33,8 @@ <name>groupid</name> <type>string</type> <size>255</size> -<<<<<<< HEAD:lib/srdb1/schema/dr_rules.xml <description>The ID(s) of the routing group(s) this rule is to be used for - comma separeted list of numerical Ids -======= - <description>list of routing group IDs ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_rules.xml </description> </column> @@ -54,22 +42,14 @@ <name>prefix</name> <type>string</type> <size>64</size> -<<<<<<< HEAD:lib/srdb1/schema/dr_rules.xml <description>Numerical prefix to match this rule</description> -======= - <description>Destination prefix for this rule</description> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_rules.xml </column> <column id="timerec"> <name>timerec</name> <type>string</type> <size>255</size> -<<<<<<< HEAD:lib/srdb1/schema/dr_rules.xml <description>Time recurrence used for matching this rule.</description> -======= - <description>Time recurrence for this rule.</description> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_rules.xml </column> <column id="priority"> @@ -77,39 +57,24 @@ <type>int</type> <size>11</size> <default>0</default> -<<<<<<< HEAD:lib/srdb1/schema/dr_rules.xml <description>Priority of this rule (among rules with same prefix and timerec).</description> -======= - <description>Priority of the rule.</description> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_rules.xml </column> <column id="routeid"> <name>routeid</name> <type>string</type> -<<<<<<< HEAD:lib/srdb1/schema/dr_rules.xml <size>255</size> <description>Route block (from cfg script) to be called when rule matches.</description> -======= - <size>64</size> - <description>Name of route block (from cfg script) to be - executed when matching this rule.</description> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_rules.xml </column> <column id="gwlist"> <name>gwlist</name> <type>string</type> <size>255</size> -<<<<<<< HEAD:lib/srdb1/schema/dr_rules.xml <description>Reference to the GWs/destinations to be used when rule matches.</description> -======= - <description>The list of destinations (gws) to be used when - matching this rule.</description> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_rules.xml </column> <column id="description"> @@ -117,15 +82,7 @@ <type>string</type> <size>128</size> <default></default> -<<<<<<< HEAD:lib/srdb1/schema/dr_rules.xml <description>Text description of the rule</description> </column> </table> -======= - <description>Short description of the rule</description> - </column> - -</table> - ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/dr_rules.xml diff --git a/lib/srdb1/schema/kamailio-drouting.xml b/lib/srdb1/schema/kamailio-drouting.xml index 6d4f59b..d058f9b 100644 --- a/lib/srdb1/schema/kamailio-drouting.xml +++ b/lib/srdb1/schema/kamailio-drouting.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE database PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" -<<<<<<< HEAD:lib/srdb1/schema/kamailio-drouting.xml "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ -======= - "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/kamailio-drouting.xml <!ENTITY % entities SYSTEM "entities.xml"> %entities; @@ -12,15 +8,9 @@ ]> <database xmlns:xi="http://www.w3.org/2001/XInclude"> -<<<<<<< HEAD:lib/srdb1/schema/kamailio-drouting.xml <name>Dynamic Routing</name> <xi:include href="dr_gateways.xml"/> <xi:include href="dr_rules.xml"/> <xi:include href="dr_gw_lists.xml"/> <xi:include href="dr_groups.xml"/> -======= - <name>DRouting</name> - <xi:include href="dr_gateways.xml"/> - <xi:include href="dr_rules.xml"/> ->>>>>>> 8e298ed9462ccd639d054cd7639278fdd3932ee9:lib/srdb1/schema/kamailio-drouting.xml </database>