lib/srdb1/schema: replaced lcr schema files

- Replaced lcr and gw schema files with lcr_rule, lcr_rule_target and
  lcr_gw schema files.

lib/srdb1/schema/gw.xml → lib/srdb1/schema/lcr_gw.xml

@@ -8,12 +8,13 @@
 ]>
 
 
-<table id="gw" xmlns:db="http://docbook.org/ns/docbook">
-    <name>gw</name>
-    <version>11</version>
+<table id="lcr_gw" xmlns:db="http://docbook.org/ns/docbook">
+    <name>lcr_gw</name>
+    <version>1</version>
     <type db="mysql">&MYSQL_TABLE_TYPE;</type>
     <description>
-        <db:para>This table contains Least Cost Routing Gateway definitions for the LCR module.
+        <db:para>This table is used by lcr (Least Cost Routing) module
+	         to store gateway attributes.
                  More information can be found at: &KAMAILIO_MOD_DOC;lcr.html.
         </db:para>
     </description>
@@ -37,16 +38,11 @@
         <name>gw_name</name>
         <type>string</type>
         <size>128</size>
-        <description>Name of the gateway</description>
+        <null/>
+        <description>Name of the gateway (for documentation only)</description>
         <natural/>
     </column>
 
-    <column id="grp_id">
-        <name>grp_id</name>
-        <type>unsigned int</type>
-        <description>ID of gateway's group</description>
-    </column>
-
     <column id="ip_addr">
         <name>ip_addr</name>
         <type>string</type>
@@ -89,7 +85,7 @@
         <name>transport</name>
         <type>unsigned char</type>
         <null/>
-        <description>Transport type to be used for the gateway</description>
+        <description>Transport protocol to be used for the gateway</description>
     </column>
 
     <column id="strip">
@@ -108,13 +104,6 @@
         <description>Request URI user part tag</description>
     </column>
 
-    <column id="weight">
-        <name>weight</name>
-        <type>unsigned int</type>
-        <null/>
-        <description>Weight of gateway within gw_grp.  Valid values are 1-254.</description>
-    </column>
-
     <column id="flags">
         <name>flags</name>
         <type>unsigned int</type>
@@ -127,22 +116,14 @@
         <type>unsigned int</type>
         <null/>
         <default><null/></default>
-        <description>If not null, contains unix timestamp telling when gw becomes operational.</description>
+        <description>If not null, contains unix timestamp telling when gw becomes operational</description>
     </column>
 
     <index>
-        <name>lcr_id_grp_id_gw_name_idx</name>
-        <colref linkend="lcr_id"/>
-        <colref linkend="grp_id"/>
-        <colref linkend="gw_name"/>
-        <unique/>
-    </index>
-
-    <index>
-        <name>lcr_id_grp_id_ip_addr_hostname_idx</name>
+        <name>lcr_id_ip_addr_port_hostname_idx</name>
         <colref linkend="lcr_id"/>
-        <colref linkend="grp_id"/>
         <colref linkend="ip_addr"/>
+        <colref linkend="port"/>
         <colref linkend="hostname"/>
         <unique/>
     </index>

lib/srdb1/schema/lcr.xml → lib/srdb1/schema/lcr_rule.xml

@@ -7,12 +7,13 @@
 
 ]>
 
-<table id="lcr" xmlns:db="http://docbook.org/ns/docbook">
-    <name>lcr</name>
-    <version>3</version>
+<table id="lcr_rule" xmlns:db="http://docbook.org/ns/docbook">
+    <name>lcr_rule</name>
+    <version>1</version>
     <type db="mysql">&MYSQL_TABLE_TYPE;</type>
     <description>
-        <db:para>This table is used by the lcr (Least Cost Routing) rules.
+        <db:para>This table is used by the lcr (Least Cost Routing)
+	    module to store routing rules.
             More information can be found at: &KAMAILIO_MOD_DOC;lcr.html.
         </db:para>
     </description>
@@ -36,7 +37,7 @@
         <name>prefix</name>
         <type>string</type>
         <size>16</size>
-		<null/>
+	<null/>
         <default><null/></default>
         <description>Prefix of Request URI user part</description>
         <natural/>
@@ -48,24 +49,29 @@
         <size>&domain_len;</size>
         <null/>
         <default><null/></default>
-        <description>Pattern that is matched to caller's URI</description>
+        <description>PCRE regular expression that is matched to caller's URI</description>
     </column>
 
-    <column id="grp_id">
-        <name>grp_id</name>
+    <column id="stopper">
+        <name>stopper</name>
         <type>unsigned int</type>
-        <description>Group ID</description>
+        <default>0</default>
+        <description>Tells if rule is "stopper" rule</description>
     </column>
 
-    <column>
-        <name>priority</name>
-        <type>unsigned char</type>
-        <description>Priority</description>
+    <column id="enabled">
+        <name>enabled</name>
+        <type>unsigned int</type>
+        <default>1</default>
+        <description>Tells if rule is enabled</description>
     </column>
 
     <index>
-        <name>lcr_id_idx</name>
+        <name>lcr_id_prefix_from_uri_idx</name>
         <colref linkend="lcr_id"/>
+        <colref linkend="prefix"/>
+        <colref linkend="from_uri"/>
+	<unique/>
     </index>
 
 </table>

lib/srdb1/schema/lcr_rule_target.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE table PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" 
+  "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [
+
+<!ENTITY % entities SYSTEM "entities.xml">
+%entities;
+
+]>
+
+<table id="lcr_rule_target" xmlns:db="http://docbook.org/ns/docbook">
+    <name>lcr_rule_target</name>
+    <version>1</version>
+    <type db="mysql">&MYSQL_TABLE_TYPE;</type>
+    <description>
+        <db:para>This table is used by the lcr (Least Cost Routing)
+	    module to store routing rule targets.
+            More information can be found at: &KAMAILIO_MOD_DOC;lcr.html.
+        </db:para>
+    </description>
+
+    <column id="id">
+        <name>id</name>
+        <type>unsigned int</type>
+        <size>&table_id_len;</size>
+        <autoincrement/>
+        <primary/>
+        <type db="dbtext">int,auto</type>
+    </column>
+
+    <column id="lcr_id">
+        <name>lcr_id</name>
+        <type>unsigned short</type>
+        <description>LCR instance identifier</description>
+    </column>
+
+    <column id="rule_id">
+        <name>rule_id</name>
+        <type>unsigned int</type>
+        <description>Identifies a rule in lcr_rule table</description>
+    </column>
+
+    <column id="gw_id">
+        <name>gw_id</name>
+        <type>unsigned int</type>
+        <description>Identifies a gateway in lcr_gw table</description>
+    </column>
+
+    <column>
+        <name>priority</name>
+        <type>unsigned char</type>
+        <description>Priority of this target (0-255)</description>
+    </column>
+
+    <column id="weight">
+        <name>weight</name>
+        <type>unsigned int</type>
+        <default>1</default>
+        <description>Weight of this target (1-254)</description>
+    </column>
+
+    <index>
+        <name>rule_id_gw_id_idx</name>
+        <colref linkend="rule_id"/>
+        <colref linkend="gw_id"/>
+	<unique/>
+    </index>
+
+    <index>
+        <name>lcr_id_idx</name>
+        <colref linkend="lcr_id"/>
+    </index>
+
+</table>