- add 'description_len' to entitity.xml

- sync description length and type of globalblacklist table to carrierroute
- remove description column of userblacklist table, this is not really needed
- carrierroute and carrierfailureroute table use the entity, no visible change


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

lib/srdb1/schema/carrierfailureroute.xml

@@ -94,7 +94,7 @@
 		  <column>
 			  <name>description</name>
 			  <type>string</type>
-			  <size>&hf_len;</size>
+			  <size>&description_len;</size>
 			  <null/>
 			  <default><null/></default>
 			  <description>A comment for the route entry, useful for larger routing tables.</description>

lib/srdb1/schema/carrierroute.xml

@@ -109,7 +109,7 @@
 		  <column>
 			  <name>description</name>
 			  <type>string</type>
-			  <size>&hf_len;</size>
+			  <size>&description_len;</size>
 			  <null/>
 			  <default><null/></default>
 			  <description>A comment for the route entry, useful for larger routing tables.</description>

lib/srdb1/schema/entities.xml

@@ -15,6 +15,7 @@
 <!ENTITY cseq_len "11">
 <!ENTITY expires_len "11">
 <!ENTITY flag_len "11">
+<!ENTITY description_len "255">
 <!ENTITY MYSQL_TABLE_TYPE "MyISAM">
 <!ENTITY USERCOL "username">
 <!ENTITY DEFAULT_ALIASES_EXPIRES "2020-05-28 21:32:15">

lib/srdb1/schema/globalblacklist.xml

@@ -45,8 +45,9 @@
      <column>
         <name>description</name>
         <type>string</type>
-        <size>&user_len;</size>
-        <default/>
+        <size>&description_len;</size>
+        <null/>
+        <default><null/></default>
         <description>A comment for the entry.</description>
     </column>
 

lib/srdb1/schema/userblacklist.xml

@@ -58,14 +58,6 @@
         <description>Specify if this a blacklist (0) or a whitelist (1) entry.</description>
     </column>
 
-     <column>
-        <name>description</name>
-        <type>string</type>
-        <size>&user_len;</size>
-        <default/>
-        <description>A comment for the entry.</description>
-    </column>
-
     <index>
         <name>userblacklist_idx</name>
         <colref linkend="username"/>