- followed the suggestions of Adrian Georgescu to use the same names in equivalent columns from watchers and active_watchers database tables

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2923 689a6050-402a-0410-94f2-e92a70836424

lib/srdb1/schema/pr_active_watchers.xml

@@ -9,7 +9,7 @@
 
 <table id="active_watchers" xmlns:db="http://docbook.org/ns/docbook">
     <name>active_watchers</name>
-    <version>8</version>
+    <version>9</version>
     <type db="mysql">&MYSQL_TABLE_TYPE;</type>
     <description>
         <db:para>Table for the presence module. More information can be found at: &OPENSER_MOD_DOC;presence.html
@@ -27,41 +27,42 @@
         <description>Unique ID</description>
     </column>
 
-    <column id="pres_uri">
-        <name>pres_uri</name>
+    <column id="presentity_uri">
+        <name>presentity_uri</name>
         <type>string</type>
         <size>&uri_len;</size>
         <description>Presence URI</description>
     </column>
-
-    <column>
-        <name>to_user</name>
+   
+	<column>
+        <name>watcher_username</name>
         <type>string</type>
         <size>&user_len;</size>
-        <description>To User</description>
+        <description>From User</description>
     </column>
 
     <column>
-        <name>to_domain</name>
+        <name>watcher_domain</name>
         <type>string</type>
         <size>&domain_len;</size>
-        <description>To Domain</description>
+        <description>From Domain</description>
     </column>
 
     <column>
-        <name>from_user</name>
+        <name>to_user</name>
         <type>string</type>
         <size>&user_len;</size>
-        <description>From User</description>
+        <description>To User</description>
     </column>
 
     <column>
-        <name>from_domain</name>
+        <name>to_domain</name>
         <type>string</type>
         <size>&domain_len;</size>
-        <description>From Domain</description>
+        <description>To Domain</description>
     </column>
 
+  
     <column>
         <name>event</name>
         <type>string</type>
@@ -173,7 +174,7 @@
 
     <index>
         <name>pctt_watchers</name>
-        <colref linkend="pres_uri"/>
+        <colref linkend="presentity_uri"/>
         <colref linkend="callid"/>
         <colref linkend="to_tag"/>
         <colref linkend="from_tag"/>

lib/srdb1/schema/pr_watchers.xml

@@ -9,7 +9,7 @@
 
 <table id="watchers" xmlns:db="http://docbook.org/ns/docbook">
     <name>watchers</name>
-    <version>2</version>
+    <version>3</version>
     <type db="mysql">&MYSQL_TABLE_TYPE;</type>
     <description>
         <db:para>Table for the presence module. More information can be found at: &OPENSER_MOD_DOC;presence.html
@@ -27,22 +27,22 @@
         <description>Unique ID</description>
     </column>
 
-    <column id="p_uri">
-        <name>p_uri</name>
+    <column id="presentity_uri">
+        <name>presentity_uri</name>
         <type>string</type>
         <size>&uri_len;</size>
         <description>Presentity Uri</description>
     </column>
 
-    <column id="w_user">
-        <name>w_user</name>
+    <column id="watcher_username">
+        <name>watcher_username</name>
         <type>string</type>
         <size>&user_len;</size>
         <description>Watcher User</description>
     </column>
 
-    <column id="w_domain">
-        <name>w_domain</name>
+    <column id="watcher_domain">
+        <name>watcher_domain</name>
         <type>string</type>
         <size>&domain_len;</size>
         <description>Watcher Domain</description>
@@ -57,7 +57,7 @@
     </column>
 
     <column>
-        <name>subs_status</name>
+        <name>status</name>
 		<type>int</type>
 		<size>11</size>
         <description>Status</description>
@@ -79,9 +79,9 @@
 
     <index>
         <name>uude_watchers</name>
-        <colref linkend="p_uri"/>
-        <colref linkend="w_user"/>
-        <colref linkend="w_domain"/>
+        <colref linkend="presentity_uri"/>
+        <colref linkend="watcher_username"/>
+        <colref linkend="watcher_domain"/>
         <colref linkend="event"/>
         <unique/>
     </index>