Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-18 06:25:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 16.155.15

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2017-03-12 19:54:12 +01:00
parent 64ddb2ef1f
commit 61e96d8b4a
4 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/swad.sql
View File

@ -607,8 +607,8 @@ CREATE TABLE IF NOT EXISTS institutions (
--
CREATE TABLE IF NOT EXISTS links (
LnkCod INT NOT NULL AUTO_INCREMENT,
ShortName VARCHAR(32) NOT NULL,
FullName VARCHAR(127) NOT NULL,
ShortName VARCHAR(511) NOT NULL,
FullName VARCHAR(2047) NOT NULL,
WWW VARCHAR(255) NOT NULL,
UNIQUE INDEX(LnkCod));
--

9
swad_changelog.h
View File

@ -207,14 +207,19 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.155.14 (2017-03-12)"
#define Log_PLATFORM_VERSION "SWAD 16.155.15 (2017-03-12)"
#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.155.14:Mar 11, 2017 Adjusting size of database fields. (? lines)
Version 16.155.15:Mar 11, 2017 Adjusting size of database fields. (216746 lines)
2 changes necessary in database:
ALTER TABLE links CHANGE COLUMN ShortName ShortName VARCHAR(511) NOT NULL;
ALTER TABLE links CHANGE COLUMN FullName FullName VARCHAR(2047) NOT NULL;
Version 16.155.14:Mar 11, 2017 Adjusting size of database fields. (216737 lines)
2 changes necessary in database:
ALTER TABLE institutions CHANGE COLUMN ShortName ShortName VARCHAR(511) COLLATE latin1_spanish_ci NOT NULL;
ALTER TABLE institutions CHANGE COLUMN FullName FullName VARCHAR(2047) COLLATE latin1_spanish_ci NOT NULL;

28
swad_database.c
View File

@ -1311,22 +1311,22 @@ mysql> DESCRIBE institutions;
/***** Table links *****/
/*
mysql> DESCRIBE links;
+-----------+--------------+------+-----+---------+----------------+
| Field | Type | Null | Key | Default | Extra |
+-----------+--------------+------+-----+---------+----------------+
| LnkCod | int(11) | NO | PRI | NULL | auto_increment |
| ShortName | varchar(32) | NO | | NULL | |
| FullName | varchar(127) | NO | | NULL | |
| WWW | varchar(255) | NO | | NULL | |
+-----------+--------------+------+-----+---------+----------------+
4 rows in set (0.00 sec)
+-----------+---------------+------+-----+---------+----------------+
| Field | Type | Null | Key | Default | Extra |
+-----------+---------------+------+-----+---------+----------------+
| LnkCod | int(11) | NO | PRI | NULL | auto_increment |
| ShortName | varchar(511) | NO | | NULL | |
| FullName | varchar(2047) | NO | | NULL | |
| WWW | varchar(255) | NO | | NULL | |
+-----------+---------------+------+-----+---------+----------------+
4 rows in set (0,00 sec)
*/
DB_CreateTable ("CREATE TABLE IF NOT EXISTS links ("
"LnkCod INT NOT NULL AUTO_INCREMENT,"
"ShortName VARCHAR(32) NOT NULL,"
"FullName VARCHAR(127) NOT NULL,"
"WWW VARCHAR(255) NOT NULL,"
"UNIQUE INDEX(LnkCod))");
"LnkCod INT NOT NULL AUTO_INCREMENT,"
"ShortName VARCHAR(511) NOT NULL," // Lnk_MAX_BYTES_LINK_SHRT_NAME
"FullName VARCHAR(2047) NOT NULL," // Lnk_MAX_BYTES_LINK_FULL_NAME
"WWW VARCHAR(255) NOT NULL," // Cns_MAX_BYTES_WWW
"UNIQUE INDEX(LnkCod))");
/***** Table log_banners *****/
/*

17
swad_link.c
View File

@ -198,7 +198,7 @@ void Lnk_EditLinks (void)
void Lnk_GetListLinks (void)
{
char Query[512];
char Query[256];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned long NumRows;
@ -261,7 +261,7 @@ void Lnk_GetListLinks (void)
void Lnk_GetDataOfLinkByCod (struct Link *Lnk)
{
char Query[1024];
char Query[256];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned long NumRows;
@ -273,7 +273,8 @@ void Lnk_GetDataOfLinkByCod (struct Link *Lnk)
if (Lnk->LnkCod > 0)
{
/***** Get data of an institutional link from database *****/
sprintf (Query,"SELECT ShortName,FullName,WWW FROM links WHERE LnkCod='%ld'",
sprintf (Query,"SELECT ShortName,FullName,WWW FROM links"
" WHERE LnkCod='%ld'",
Lnk->LnkCod);
NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get data of an institutional link");
@ -423,7 +424,7 @@ long Lnk_GetParamLnkCod (void)
void Lnk_RemoveLink (void)
{
extern const char *Txt_Link_X_removed;
char Query[512];
char Query[128];
struct Link Lnk;
/***** Get link code *****/
@ -434,7 +435,8 @@ void Lnk_RemoveLink (void)
Lnk_GetDataOfLinkByCod (&Lnk);
/***** Remove link *****/
sprintf (Query,"DELETE FROM links WHERE LnkCod='%ld'",Lnk.LnkCod);
sprintf (Query,"DELETE FROM links WHERE LnkCod='%ld'",
Lnk.LnkCod);
DB_QueryDELETE (Query,"can not remove an institutional link");
/***** Write message to show the change made *****/
@ -776,7 +778,10 @@ void Lnk_RecFormNewLink (void)
static void Lnk_CreateLink (struct Link *Lnk)
{
extern const char *Txt_Created_new_link_X;
char Query[1024];
char Query[256 +
Lnk_MAX_BYTES_LINK_SHRT_NAME +
Lnk_MAX_BYTES_LINK_FULL_NAME +
Cns_MAX_BYTES_WWW];
/***** Create a new link *****/
sprintf (Query,"INSERT INTO links (ShortName,FullName,WWW)"