* RECORDS: New database 31

- support video directory per recorder (REQUEST #4306 )
(this directory should now defined with vdrlist/vdredit)
* RECORDS: calc cut marks, display length of by cut recording
* update-xxv: add file check, avoid missing upgrade-xxv-db.sql
* update locale de

2 files changed, 22 insertions, 5 deletions

diff --git a/contrib/update-xxv b/contrib/update-xxv
index a611e4f..8567cd4 100755
--- a/contrib/update-xxv
+++ b/contrib/update-xxv
@@ -18,7 +18,7 @@
 
 # Increment the version number each time the database changes!
 #
-actualVersion=30
+actualVersion=31
 
 # Specify tables to export before and import after update
 #
@@ -43,6 +43,7 @@ showHelp()
     echo '-d <database>  : XXV database name (default: xxv)'
     echo '-u <user>      : Username (default: root)'
     echo '-p <password>  : Password (default: no password)'
+    echo '-s <sql-file>  : Upgrade sql script (default: upgrade-xxv-db.sql)'
     echo '-a             : Ask for password'
     echo '-f             : Force upgrade, do not check version'
     echo '-v             : Display actual version'
@@ -76,6 +77,7 @@ setDefaults()
     [ -z $user ] && user='root'
     [ -z $isForceUpdate ] && isForceUpdate='false'
     [ -z $askPassword ] && askPassword='false'
+    [ -z $upgrade ] && upgrade='upgrade-xxv-db.sql'
 }
 
 buildMysqlParams()
@@ -101,6 +103,14 @@ checkXxv()
     fi
 }
 
+checkFiles()
+{
+    if [ ! -e "$upgrade" ]; then
+        showError "File '$upgrade' not found!"
+        exit 1
+    fi
+}
+
 checkServer()
 {
     showInfo 'Checking Server'
@@ -157,7 +167,7 @@ importDb()
 updateDb()
 {
     showInfo 'Updating database'
-    if ! eval mysql $mysqlParams -f -B $database < upgrade-xxv-db.sql ; then
+    if ! eval mysql $mysqlParams -f -B $database < $upgrade ; then
         showError 'Update failed!' ;
     	  exit 1
     fi
@@ -235,6 +245,9 @@ while [ $# -ge 1 ] ; do
         -p)
             password=$2 ; shift
         ;;
+        -s)
+            $upgrade=$2 ; shift
+        ;;
     	-a)
             askPassword='true'
     	;;
@@ -261,6 +274,9 @@ checkXxv
 setDefaults
 buildMysqlParams
 
+# check needed files
+checkFiles
+
 # check the database
 checkServer
 checkDatabase
diff --git a/contrib/upgrade-xxv-db.sql b/contrib/upgrade-xxv-db.sql
index 5cbf4a4..3251a99 100644
--- a/contrib/upgrade-xxv-db.sql
+++ b/contrib/upgrade-xxv-db.sql
@@ -149,6 +149,7 @@ CREATE TABLE IF NOT EXISTS `RECORDER` (
   `host` varchar(100) NOT NULL default 'localhost',
   `port` smallint(4) unsigned default '2001',
   `cards` varchar(100) default '',
+  `videodirectory` text default '',
   PRIMARY KEY  (`id`)
 );
 
@@ -159,10 +160,10 @@ CREATE TABLE IF NOT EXISTS `RECORDER` (
 CREATE TABLE IF NOT EXISTS `USER` (
   `Id` int(11) unsigned NOT NULL auto_increment,
   `Name` varchar(100) NOT NULL default '',
-  `Password` varchar(100) NOT NULL,
+  `Password` varchar(32) NOT NULL,
   `Level` set('admin','user','guest') NOT NULL,
-  `Prefs` varchar(100) default '',
-  `UserPrefs` varchar(100) default '',
+  `Prefs` text default '',
+  `UserPrefs` text default '',
   `Deny` set('tlist','alist','rlist','mlist','tedit','aedit','redit','remote','stream','cedit','media') default NULL,
   `MaxLifeTime` tinyint(2) default '0',
   `MaxPriority` tinyint(2) default '0',