* Reorder file names of documentation

* Create upgrade-xxv-db.sql only with user data tables

4 files changed, 26 insertions, 176 deletions

diff --git a/contrib/export-data.sql b/contrib/export-data.sql
index d863159..3154497 100644
--- a/contrib/export-data.sql
+++ b/contrib/export-data.sql
@@ -3,8 +3,9 @@
 --
 
 select * INTO OUTFILE '/tmp/autotimer.sav' from AUTOTIMER;
-select * INTO OUTFILE '/tmp/user.sav' from USER;
 select * INTO OUTFILE '/tmp/chronicle.sav' from CHRONICLE;
 select * INTO OUTFILE '/tmp/medialib_actors.sav' from MEDIALIB_ACTORS;
 select * INTO OUTFILE '/tmp/medialib_videodata.sav' from MEDIALIB_VIDEODATA;
 select * INTO OUTFILE '/tmp/medialib_videogenre.sav' from MEDIALIB_VIDEOGENRE;
+select * INTO OUTFILE '/tmp/user.sav' from USER;
+
diff --git a/contrib/import-data.sql b/contrib/import-data.sql
index fbad5e8..003ff05 100644
--- a/contrib/import-data.sql
+++ b/contrib/import-data.sql
@@ -4,14 +4,15 @@
 
 DELETE from AUTOTIMER;
 DELETE from CHRONICLE;
-DELETE from USER;
 DELETE from MEDIALIB_ACTORS;
 DELETE from MEDIALIB_VIDEODATA;
 DELETE from MEDIALIB_VIDEOGENRE;
+DELETE from USER;
 
 load data infile '/tmp/autotimer.sav' into table AUTOTIMER;
-load data infile '/tmp/user.sav' into table USER;
 load data infile '/tmp/chronicle.sav' into table CHRONICLE;
 load data infile '/tmp/medialib_actors.sav' into table MEDIALIB_ACTORS;
 load data infile '/tmp/medialib_videodata.sav' into table MEDIALIB_VIDEODATA;
 load data infile '/tmp/medialib_videogenre.sav' into table MEDIALIB_VIDEOGENRE;
+load data infile '/tmp/user.sav' into table USER;
+
diff --git a/contrib/update-xxv b/contrib/update-xxv
index e4a6dc4..b9151e5 100755
--- a/contrib/update-xxv
+++ b/contrib/update-xxv
@@ -22,7 +22,7 @@ actualVersion=25
 
 # Specify tables to export before and import after update
 #
-tables='AUTOTIMER USER CHRONICLE MEDIALIB_ACTORS MEDIALIB_VIDEODATA MEDIALIB_VIDEOGENRE'
+tables='AUTOTIMER CHRONICLE MEDIALIB_ACTORS MEDIALIB_VIDEODATA MEDIALIB_VIDEOGENRE USER'
 
 showTitle()
 {
diff --git a/contrib/upgrade-xxv-db.sql b/contrib/upgrade-xxv-db.sql
index 7ca4f5e..cbfd939 100644
--- a/contrib/upgrade-xxv-db.sql
+++ b/contrib/upgrade-xxv-db.sql
@@ -1,8 +1,14 @@
--- MySQL dump 10.10
+-- MySQL dump 10.11
 --
 -- Host: localhost    Database: xxv
 -- ------------------------------------------------------
--- Server version	5.0.30-Debian_3
+-- Server version	5.0.32-Debian_7etch1
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,MYSQL40,NO_TABLE_OPTIONS' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
 --
 -- Table structure for table `AUTOTIMER`
@@ -30,44 +36,7 @@ CREATE TABLE `AUTOTIMER` (
   `stopdate` datetime default NULL,
   `count` int(11) default NULL,
   PRIMARY KEY  (`Id`)
-) TYPE=MyISAM;
-
---
--- Table structure for table `CHANNELGROUPS`
---
-
-DROP TABLE IF EXISTS `CHANNELGROUPS`;
-CREATE TABLE `CHANNELGROUPS` (
-  `Id` int(11) NOT NULL auto_increment,
-  `Name` varchar(100) default 'unknown',
-  `Counter` int(11) default '0',
-  PRIMARY KEY  (`Id`)
-) TYPE=MyISAM;
-
---
--- Table structure for table `CHANNELS`
---
-
-DROP TABLE IF EXISTS `CHANNELS`;
-CREATE TABLE `CHANNELS` (
-  `Id` varchar(100) NOT NULL,
-  `Name` varchar(100) NOT NULL default '',
-  `Frequency` int(11) NOT NULL default '0',
-  `Parameters` varchar(100) default '',
-  `Source` varchar(100) default NULL,
-  `Srate` int(11) default '0',
-  `VPID` varchar(100) default '',
-  `APID` varchar(100) default '',
-  `TPID` varchar(100) default '',
-  `CA` varchar(100) default '',
-  `SID` int(11) default '0',
-  `NID` int(11) default '0',
-  `TID` int(11) default '0',
-  `RID` int(11) default '0',
-  `GRP` int(11) default '0',
-  `POS` int(11) NOT NULL,
-  PRIMARY KEY  (`Id`)
-) TYPE=MyISAM;
+);
 
 --
 -- Table structure for table `CHRONICLE`
@@ -83,32 +52,7 @@ CREATE TABLE `CHRONICLE` (
   `duration` int(11) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `hash` (`hash`)
-) TYPE=MyISAM;
-
---
--- Table structure for table `EPG`
---
-
-DROP TABLE IF EXISTS `EPG`;
-CREATE TABLE `EPG` (
-  `eventid` bigint(20) unsigned NOT NULL default '0',
-  `title` text NOT NULL,
-  `subtitle` text,
-  `description` text,
-  `channel_id` varchar(100) NOT NULL default '',
-  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `duration` int(11) NOT NULL default '0',
-  `tableid` tinyint(4) default '0',
-  `image` text,
-  `version` tinyint(3) default '0',
-  `video` varchar(100) default '',
-  `audio` varchar(255) default '',
-  `addtime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `vpstime` datetime default '0000-00-00 00:00:00',
-  PRIMARY KEY  (`eventid`),
-  KEY `starttime` (`starttime`),
-  KEY `channel_id` (`channel_id`)
-) TYPE=MyISAM;
+);
 
 --
 -- Table structure for table `MEDIALIB_ACTORS`
@@ -121,7 +65,7 @@ CREATE TABLE `MEDIALIB_ACTORS` (
   `imgurl` varchar(255) NOT NULL default '',
   `checked` timestamp NOT NULL,
   PRIMARY KEY  (`name`)
-) TYPE=MyISAM;
+);
 
 --
 -- Table structure for table `MEDIALIB_VIDEODATA`
@@ -169,7 +113,7 @@ CREATE TABLE `MEDIALIB_VIDEODATA` (
   KEY `mediatype` (`mediatype`,`istv`),
   FULLTEXT KEY `actors_idx` (`actors`),
   FULLTEXT KEY `comment` (`comment`)
-) TYPE=MyISAM;
+);
 
 --
 -- Table structure for table `MEDIALIB_VIDEOGENRE`
@@ -180,102 +124,7 @@ CREATE TABLE `MEDIALIB_VIDEOGENRE` (
   `video_id` int(10) unsigned NOT NULL default '0',
   `genre_id` int(10) unsigned NOT NULL default '0',
   PRIMARY KEY  (`video_id`,`genre_id`)
-) TYPE=MyISAM;
-
---
--- Table structure for table `MUSIC`
---
-
-DROP TABLE IF EXISTS `MUSIC`;
-CREATE TABLE `MUSIC` (
-  `Id` int(11) unsigned NOT NULL auto_increment,
-  `FILE` text NOT NULL,
-  `ARTIST` varchar(128) default 'unknown',
-  `ALBUM` varchar(128) default 'unknown',
-  `TITLE` varchar(128) default 'unknown',
-  `COMMENT` varchar(128) default NULL,
-  `TRACKNUM` varchar(10) default '0',
-  `YEAR` smallint(4) unsigned default NULL,
-  `GENRE` varchar(128) default NULL,
-  `BITRATE` smallint(4) unsigned default NULL,
-  `FREQUENCY` varchar(4) default NULL,
-  `SECS` int(11) NOT NULL,
-  PRIMARY KEY  (`Id`)
-) TYPE=MyISAM;
-
---
--- Table structure for table `OLDEPG`
---
-
-DROP TABLE IF EXISTS `OLDEPG`;
-CREATE TABLE `OLDEPG` (
-  `eventid` bigint(20) unsigned NOT NULL default '0',
-  `title` text NOT NULL,
-  `subtitle` text,
-  `description` text,
-  `channel_id` varchar(100) NOT NULL default '',
-  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `duration` int(11) NOT NULL default '0',
-  `tableid` tinyint(4) default '0',
-  `image` text,
-  `version` tinyint(3) default '0',
-  `video` varchar(100) default '',
-  `audio` varchar(255) default '',
-  `addtime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `vpstime` datetime default '0000-00-00 00:00:00',
-  PRIMARY KEY  (`eventid`),
-  KEY `starttime` (`starttime`),
-  KEY `channel_id` (`channel_id`)
-) TYPE=MyISAM;
-
---
--- Table structure for table `RECORDS`
---
-
-DROP TABLE IF EXISTS `RECORDS`;
-CREATE TABLE `RECORDS` (
-  `eventid` bigint(20) unsigned NOT NULL,
-  `RecordId` int(11) unsigned NOT NULL,
-  `RecordMD5` varchar(32) NOT NULL,
-  `Path` text NOT NULL,
-  `Prio` tinyint(4) NOT NULL,
-  `Lifetime` tinyint(4) NOT NULL,
-  `State` tinyint(4) NOT NULL,
-  `FileSize` int(11) unsigned default '0',
-  `Marks` text,
-  `Type` enum('TV','RADIO','UNKNOWN') default 'TV',
-  `addtime` timestamp NOT NULL,
-  PRIMARY KEY  (`eventid`),
-  UNIQUE KEY `eventid` (`eventid`)
-) TYPE=MyISAM;
-
---
--- Table structure for table `TIMERS`
---
-
-DROP TABLE IF EXISTS `TIMERS`;
-CREATE TABLE `TIMERS` (
-  `Id` int(11) unsigned NOT NULL,
-  `Status` char(1) default '1',
-  `ChannelID` varchar(100) NOT NULL default '',
-  `Day` varchar(20) default '-------',
-  `Start` int(11) unsigned default NULL,
-  `Stop` int(11) unsigned default NULL,
-  `Priority` tinyint(2) default NULL,
-  `Lifetime` tinyint(2) default NULL,
-  `File` text,
-  `Summary` text,
-  `NextStartTime` datetime default NULL,
-  `NextStopTime` datetime default NULL,
-  `Collision` varchar(100) default '0',
-  `eventid` bigint(20) unsigned default '0',
-  `eventstarttime` datetime default NULL,
-  `eventduration` int(10) unsigned default '0',
-  `AutotimerId` int(11) unsigned default '0',
-  `addtime` timestamp NOT NULL,
-  `Checked` char(1) default '0',
-  PRIMARY KEY  (`Id`)
-) TYPE=MyISAM;
+);
 
 --
 -- Table structure for table `USER`
@@ -293,13 +142,12 @@ CREATE TABLE `USER` (
   `MaxLifeTime` tinyint(2) default '0',
   `MaxPriority` tinyint(2) default '0',
   PRIMARY KEY  (`Id`)
-) TYPE=MyISAM;
+);
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
---
--- Table structure for table `VERSION`
---
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
-DROP TABLE IF EXISTS `VERSION`;
-CREATE TABLE `VERSION` (
-  `Version` tinyint(4) NOT NULL default '0'
-) TYPE=MyISAM;
+-- Dump completed on 2007-11-17 17:21:22