Skip to content

Commit ffbae3f

Browse files
committed
Increase size of channel.xmltvid.
Some xmltvids are larger than 64 characters, due to strange encodings used by some listings providers. Change the xmltvid to be up to 255 characters, which should handle any xmltvid that may ever be created. Thanks to Karl Dietz for the information on XMLTV design and the suggestion to use 255 characters.
1 parent b68c614 commit ffbae3f

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

mythtv/bindings/perl/MythTV.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ package MythTV;
114114
# schema version supported in the main code. We need to check that the schema
115115
# version in the database is as expected by the bindings, which are expected
116116
# to be kept in sync with the main code.
117-
our $SCHEMA_VERSION = "1267";
117+
our $SCHEMA_VERSION = "1268";
118118

119119
# NUMPROGRAMLINES is defined in mythtv/libs/libmythtv/programinfo.h and is
120120
# the number of items in a ProgramInfo QStringList group used by

mythtv/bindings/python/MythTV/static.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"""
66

77
OWN_VERSION = (0,25,-1,1)
8-
SCHEMA_VERSION = 1267
8+
SCHEMA_VERSION = 1268
99
NVSCHEMA_VERSION = 1007
1010
MUSICSCHEMA_VERSION = 1018
1111
PROTO_VERSION = '64'

mythtv/libs/libmythtv/dbcheck.cpp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ using namespace std;
2121
mythtv/bindings/perl/MythTV.pm
2222
*/
2323
/// This is the DB schema version expected by the running MythTV instance.
24-
const QString currentDatabaseVersion = "1267";
24+
const QString currentDatabaseVersion = "1268";
2525

2626
static bool UpdateDBVersionNumber(const QString &newnumber, QString &dbver);
2727
static bool performActualUpdate(
@@ -5562,6 +5562,16 @@ NULL
55625562
return false;
55635563
}
55645564

5565+
if (dbver == "1267")
5566+
{
5567+
const char *updates[] = {
5568+
"ALTER TABLE channel MODIFY xmltvid VARCHAR(255) NOT NULL DEFAULT '';",
5569+
NULL
5570+
};
5571+
if (!performActualUpdate(updates, "1268", dbver))
5572+
return false;
5573+
}
5574+
55655575
return true;
55665576
}
55675577

0 commit comments

Comments
 (0)