diff --git a/sql/swad.sql b/sql/swad.sql index f7f1484b4..77460dce0 100644 --- a/sql/swad.sql +++ b/sql/swad.sql @@ -44,8 +44,8 @@ CREATE TABLE IF NOT EXISTS agendas ( Public ENUM('N','Y') NOT NULL DEFAULT 'N', StartTime DATETIME NOT NULL, EndTime DATETIME NOT NULL, - Event VARCHAR(255) NOT NULL, - Location VARCHAR(255) NOT NULL, + Event VARCHAR(2047) NOT NULL, + Location VARCHAR(2047) NOT NULL, Txt TEXT NOT NULL, UNIQUE INDEX(AgdCod), INDEX(UsrCod,Public)); diff --git a/swad_action.h b/swad_action.h index 494782c99..b89b24086 100644 --- a/swad_action.h +++ b/swad_action.h @@ -38,8 +38,8 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Act_MAX_CHARS_ACTION_TXT (64 - 1) // 63 -#define Act_MAX_BYTES_ACTION_TXT ((Act_MAX_CHARS_ACTION_TXT + 1) * Str_MAX_BYTES_PER_CHAR - 1) // 1023 +#define Act_MAX_CHARS_ACTION_TXT (256 - 1) // 255 +#define Act_MAX_BYTES_ACTION_TXT Act_MAX_CHARS_ACTION_TXT // 255 typedef enum { diff --git a/swad_agenda.h b/swad_agenda.h index 76723c090..b2fa193a7 100644 --- a/swad_agenda.h +++ b/swad_agenda.h @@ -34,12 +34,12 @@ /************************** Public types and constants ***********************/ /*****************************************************************************/ -#define Agd_MAX_CHARS_LOCATION (128 - 1) // 127 -#define Agd_MAX_BYTES_LOCATION ((Agd_MAX_CHARS_LOCATION + 1) * Str_MAX_BYTES_PER_CHAR - 1) // 2047 - #define Agd_MAX_CHARS_EVENT (128 - 1) // 127 #define Agd_MAX_BYTES_EVENT ((Agd_MAX_CHARS_EVENT + 1) * Str_MAX_BYTES_PER_CHAR - 1) // 2047 +#define Agd_MAX_CHARS_LOCATION (128 - 1) // 127 +#define Agd_MAX_BYTES_LOCATION ((Agd_MAX_CHARS_LOCATION + 1) * Str_MAX_BYTES_PER_CHAR - 1) // 2047 + #define Agd_NUM_DATES 2 typedef enum { diff --git a/swad_changelog.h b/swad_changelog.h index 690c1ce70..1733ef96d 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -204,13 +204,18 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.154 (2017-03-08)" +#define Log_PLATFORM_VERSION "SWAD 16.154.1 (2017-03-08)" #define CSS_FILE "swad16.147.css" #define JS_FILE "swad16.144.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1 /* + Version 16.154.1: Mar 08, 2017 Adjusting size of database fields. (216462 lines) + 2 changes necessary in database: +ALTER TABLE agendas CHANGE COLUMN Event Event VARCHAR(2047) NOT NULL; +ALTER TABLE agendas CHANGE COLUMN Location Location VARCHAR(2047) NOT NULL; + Version 16.154: Mar 08, 2017 Adjusting size of database fields. Code refactoring related to number of chars and bytes. (216458 lines) Version 16.153: Mar 08, 2017 Code refactoring related to number of chars and bytes. (216450 lines) diff --git a/swad_constant.h b/swad_constant.h index 915019e09..ccea73aed 100644 --- a/swad_constant.h +++ b/swad_constant.h @@ -36,11 +36,11 @@ #define Cns_MAX_CHARS_WWW (256 - 1) // Max. number of chars of a URL #define Cns_MAX_BYTES_WWW Cns_MAX_CHARS_WWW -#define Cns_MAX_CHARS_IP (3 + 1 + 3 + 1 + 3 + 1 + 3) // Max. number of chars of an IP address +#define Cns_MAX_CHARS_IP (3 + 1 + 3 + 1 + 3 + 1 + 3) // 15: max. number of chars of an IP address // Example: 255.255.255.255 // 3+1+3+1+3+1+3 // 123456789012345 -#define Cns_MAX_BYTES_IP Cns_MAX_CHARS_IP +#define Cns_MAX_BYTES_IP Cns_MAX_CHARS_IP // 15 #define Cns_MAX_CHARS_DATE (4 + 1 + 2 + 1 + 2) #define Cns_MAX_BYTES_DATE Cns_MAX_CHARS_DATE diff --git a/swad_database.c b/swad_database.c index 16f49c653..a6bebcabf 100644 --- a/swad_database.c +++ b/swad_database.c @@ -187,8 +187,8 @@ mysql> DESCRIBE agendas; | Hidden | enum('N','Y') | NO | | N | | | StartTime | datetime | NO | | NULL | | | EndTime | datetime | NO | | NULL | | -| Event | varchar(255) | NO | | NULL | | -| Location | varchar(255) | NO | | NULL | | +| Event | varchar(2047) | NO | | NULL | | +| Location | varchar(2047) | NO | | NULL | | | Txt | text | NO | | NULL | | +-----------+---------------+------+-----+---------+----------------+ 9 rows in set (0,00 sec) @@ -200,8 +200,8 @@ mysql> DESCRIBE agendas; "Hidden ENUM('N','Y') NOT NULL DEFAULT 'N'," "StartTime DATETIME NOT NULL," "EndTime DATETIME NOT NULL," - "Event VARCHAR(255) NOT NULL," // Agd_MAX_BYTES_EVENT - "Location VARCHAR(255) NOT NULL," + "Event VARCHAR(2047) NOT NULL," // Agd_MAX_BYTES_EVENT + "Location VARCHAR(2047) NOT NULL," // Agd_MAX_BYTES_LOCATION "Txt TEXT NOT NULL," "UNIQUE INDEX(AgdCod)," "INDEX(UsrCod,Public,Hidden))");