From 9c436403ff8210742eb50cbe0a0a393afc5850b3 Mon Sep 17 00:00:00 2001 From: acanas Date: Mon, 27 Mar 2023 12:18:14 +0200 Subject: [PATCH] Version 22.83: Mar 27, 2023 New module swad_resource_database. --- Makefile | 7 +-- swad_assignment_resource.c | 4 +- swad_attendance_resource.c | 4 +- swad_browser_resource.c | 6 +-- swad_call_for_exam_resource.c | 4 +- swad_changelog.h | 6 ++- swad_database.c | 48 +++++++++--------- swad_exam_resource.c | 4 +- swad_forum_resource.c | 4 +- swad_game_resource.c | 5 +- swad_program_database.c | 57 --------------------- swad_program_database.h | 4 -- swad_program_resource.c | 5 +- swad_project_resource.c | 3 +- swad_resource_database.c | 93 +++++++++++++++++++++++++++++++++++ swad_resource_database.h | 40 +++++++++++++++ swad_rubric_criteria.c | 5 +- swad_rubric_resource.c | 4 +- swad_survey_resource.c | 4 +- 19 files changed, 192 insertions(+), 115 deletions(-) create mode 100644 swad_resource_database.c create mode 100644 swad_resource_database.h diff --git a/Makefile b/Makefile index 91b666c2..7a24ddce 100644 --- a/Makefile +++ b/Makefile @@ -83,9 +83,10 @@ OBJS = swad_account.o swad_account_database.o swad_action.o swad_action_list.o \ swad_question.o swad_question_database.o swad_question_import.o \ swad_QR.o \ swad_record.o swad_record_database.o swad_report.o \ - swad_report_database.o swad_resource.o swad_role.o swad_role_database.o \ - swad_room.o swad_room_database.o swad_RSS.o swad_rubric.o \ - swad_rubric_criteria.o swad_rubric_database.o swad_rubric_resource.o \ + swad_report_database.o swad_resource.o swad_resource_database.o \ + swad_role.o swad_role_database.o swad_room.o swad_room_database.o \ + swad_RSS.o swad_rubric.o swad_rubric_criteria.o swad_rubric_database.o \ + swad_rubric_resource.o \ swad_scope.o swad_search.o swad_session.o swad_session_database.o \ swad_setting.o swad_setting_database.o swad_statistic.o \ swad_statistic_database.o swad_string.o swad_survey.o \ diff --git a/swad_assignment_resource.c b/swad_assignment_resource.c index fb725cd6..c2449665 100644 --- a/swad_assignment_resource.c +++ b/swad_assignment_resource.c @@ -34,7 +34,7 @@ #include "swad_form.h" #include "swad_pagination.h" #include "swad_parameter_code.h" -#include "swad_program_database.h" +#include "swad_resource_database.h" /*****************************************************************************/ /************************** Get link to assignment ***************************/ @@ -61,7 +61,7 @@ void AsgRsc_GetLinkToAssignment (void) AsgRsc_GetTitleFromAsgCod (Assignments.Asg.AsgCod,Title,sizeof (Title) - 1); /***** Copy link to assignment into resource clipboard *****/ - Prg_DB_CopyToClipboard (Rsc_ASSIGNMENT,Assignments.Asg.AsgCod); + Rsc_DB_CopyToClipboard (Rsc_ASSIGNMENT,Assignments.Asg.AsgCod); /***** Write sucess message *****/ Ale_ShowAlert (Ale_SUCCESS,Txt_Link_to_resource_X_copied_into_clipboard, diff --git a/swad_attendance_resource.c b/swad_attendance_resource.c index b236f464..ff8b5d39 100644 --- a/swad_attendance_resource.c +++ b/swad_attendance_resource.c @@ -32,7 +32,7 @@ #include "swad_error.h" #include "swad_form.h" #include "swad_parameter_code.h" -#include "swad_program_database.h" +#include "swad_resource_database.h" /*****************************************************************************/ /************************ Get link to attendance event ***********************/ @@ -51,7 +51,7 @@ void AttRsc_GetLinkToEvent (void) AttRsc_GetTitleFromAttCod (AttCod,Title,sizeof (Title) - 1); /***** Copy link to attendance event into resource clipboard *****/ - Prg_DB_CopyToClipboard (Rsc_ATTENDANCE_EVENT,AttCod); + Rsc_DB_CopyToClipboard (Rsc_ATTENDANCE_EVENT,AttCod); /***** Write sucess message *****/ Ale_ShowAlert (Ale_SUCCESS,Txt_Link_to_resource_X_copied_into_clipboard, diff --git a/swad_browser_resource.c b/swad_browser_resource.c index 757eb501..853fa5cd 100644 --- a/swad_browser_resource.c +++ b/swad_browser_resource.c @@ -33,9 +33,7 @@ #include "swad_form.h" #include "swad_global.h" #include "swad_parameter_code.h" -#include "swad_program.h" -#include "swad_program_database.h" -#include "swad_program_resource.h" +#include "swad_resource_database.h" /*****************************************************************************/ /******************** Global variables from other modules ********************/ @@ -80,7 +78,7 @@ void BrwRsc_GetLinkToFile (void) } /***** Copy link to file into resource clipboard *****/ - Prg_DB_CopyToClipboard (Type,FilCod); + Rsc_DB_CopyToClipboard (Type,FilCod); /***** Write sucess message *****/ Ale_ShowAlert (Ale_SUCCESS,Txt_Link_to_resource_X_copied_into_clipboard, diff --git a/swad_call_for_exam_resource.c b/swad_call_for_exam_resource.c index 4d559294..74a5a8ad 100644 --- a/swad_call_for_exam_resource.c +++ b/swad_call_for_exam_resource.c @@ -32,7 +32,7 @@ #include "swad_error.h" #include "swad_form.h" #include "swad_parameter_code.h" -#include "swad_program_database.h" +#include "swad_resource_database.h" /*****************************************************************************/ /************************ Get link to call for exam **************************/ @@ -52,7 +52,7 @@ void Cfe_GetLinkToCallForExam (void) CfeRsc_GetTitleFromExaCod (ExaCod,Title,sizeof (Title) - 1); /***** Copy link to call for exam into resource clipboard *****/ - Prg_DB_CopyToClipboard (Rsc_CALL_FOR_EXAM,ExaCod); + Rsc_DB_CopyToClipboard (Rsc_CALL_FOR_EXAM,ExaCod); /***** Write sucess message *****/ Ale_ShowAlert (Ale_SUCCESS,Txt_Link_to_resource_X_copied_into_clipboard, diff --git a/swad_changelog.h b/swad_changelog.h index c27b8e5f..6e15571d 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -629,10 +629,14 @@ TODO: Emilce Barrera Mesa: Podr TODO: Emilce Barrera Mesa: Mis estudiantes presentan muchas dificultades a la hora de poner la foto porque la plataforma es muy exigente respecto al fondo de la imagen. */ -#define Log_PLATFORM_VERSION "SWAD 22.82 (2023-03-27)" +#define Log_PLATFORM_VERSION "SWAD 22.83 (2023-03-27)" #define CSS_FILE "swad22.78.15.css" #define JS_FILE "swad22.49.js" /* + Version 22.83: Mar 27, 2023 New module swad_resource_database. (338208 lines) + 1 change necessary in database: +RENAME TABLE prg_clipboards TO rsc_clipboards; + Version 22.82: Mar 27, 2023 New module swad_rubric_resource. (338149 lines) Version 22.81.2: Mar 27, 2023 Changes in resources. (337974 lines) Version 22.81.1: Mar 26, 2023 Changes in resources. (338012 lines) diff --git a/swad_database.c b/swad_database.c index 32a9226d..aeb96e4e 100644 --- a/swad_database.c +++ b/swad_database.c @@ -2471,30 +2471,6 @@ mysql> DESCRIBE plg_plugins; "IP CHAR(15) NOT NULL," // Cns_MAX_BYTES_IP "UNIQUE INDEX(PlgCod))"); - /***** Table prg_clipboards *****/ -/* -mysql> DESCRIBE prg_clipboards; -+----------+-------------------------------------------------------------------------------+------+-----+---------+-------+ -| Field | Type | Null | Key | Default | Extra | -+----------+-------------------------------------------------------------------------------+------+-----+---------+-------+ -| UsrCod | int | NO | PRI | NULL | | -| CrsCod | int | NO | PRI | NULL | | -| Type | enum('non','asg','prj','cfe','exa','gam','rub','doc','mrk','att','for','svy') | NO | PRI | non | | -| Cod | int | NO | PRI | -1 | | -| CopyTime | timestamp | YES | MUL | NULL | | -+----------+-------------------------------------------------------------------------------+------+-----+---------+-------+ -5 rows in set (0,00 sec) -*/ - DB_CreateTable ("CREATE TABLE IF NOT EXISTS prg_clipboards (" - "UsrCod INT NOT NULL," - "CrsCod INT NOT NULL," - "Type ENUM('non','asg','prj','cfe','exa','gam','rub','doc','mrk','att','for','svy') NOT NULL DEFAULT 'non'," - "Cod INT NOT NULL DEFAULT -1," - "CopyTime TIMESTAMP," - "UNIQUE INDEX(UsrCod,CrsCod,Type,Cod)," - "INDEX(CrsCod,Type,Cod)," - "INDEX(CopyTime))"); - /***** Table prg_expanded *****/ /* mysql> DESCRIBE prg_expanded; @@ -2776,6 +2752,30 @@ mysql> DESCRIBE roo_check_in; "INDEX(UsrCod,CheckInTime)," "INDEX(CheckInTime))"); + /***** Table rsc_clipboards *****/ +/* +mysql> DESCRIBE rsc_clipboards; ++----------+-------------------------------------------------------------------------------+------+-----+---------+-------+ +| Field | Type | Null | Key | Default | Extra | ++----------+-------------------------------------------------------------------------------+------+-----+---------+-------+ +| UsrCod | int | NO | PRI | NULL | | +| CrsCod | int | NO | PRI | NULL | | +| Type | enum('non','asg','prj','cfe','exa','gam','rub','doc','mrk','att','for','svy') | NO | PRI | non | | +| Cod | int | NO | PRI | -1 | | +| CopyTime | timestamp | YES | MUL | NULL | | ++----------+-------------------------------------------------------------------------------+------+-----+---------+-------+ +5 rows in set (0,00 sec) +*/ + DB_CreateTable ("CREATE TABLE IF NOT EXISTS rsc_clipboards (" + "UsrCod INT NOT NULL," + "CrsCod INT NOT NULL," + "Type ENUM('non','asg','prj','cfe','exa','gam','rub','doc','mrk','att','for','svy') NOT NULL DEFAULT 'non'," + "Cod INT NOT NULL DEFAULT -1," + "CopyTime TIMESTAMP," + "UNIQUE INDEX(UsrCod,CrsCod,Type,Cod)," + "INDEX(CrsCod,Type,Cod)," + "INDEX(CopyTime))"); + /***** Table rub_criteria *****/ /* mysql> DESCRIBE rub_criteria; diff --git a/swad_exam_resource.c b/swad_exam_resource.c index 92e0b6e9..b430a1ab 100644 --- a/swad_exam_resource.c +++ b/swad_exam_resource.c @@ -33,7 +33,7 @@ #include "swad_exam_resource.h" #include "swad_form.h" #include "swad_parameter_code.h" -#include "swad_program_database.h" +#include "swad_resource_database.h" /*****************************************************************************/ /***************************** Get link to exam ******************************/ @@ -55,7 +55,7 @@ void ExaRsc_GetLinkToExam (void) ExaRsc_GetTitleFromExaCod (Exams.Exam.ExaCod,Title,sizeof (Title) - 1); /***** Copy link to exam into resource clipboard *****/ - Prg_DB_CopyToClipboard (Rsc_EXAM,Exams.Exam.ExaCod); + Rsc_DB_CopyToClipboard (Rsc_EXAM,Exams.Exam.ExaCod); /***** Write sucess message *****/ Ale_ShowAlert (Ale_SUCCESS,Txt_Link_to_resource_X_copied_into_clipboard, diff --git a/swad_forum_resource.c b/swad_forum_resource.c index 16c4f0b8..135ccce6 100644 --- a/swad_forum_resource.c +++ b/swad_forum_resource.c @@ -31,7 +31,7 @@ #include "swad_forum_database.h" #include "swad_forum_resource.h" #include "swad_global.h" -#include "swad_program_database.h" +#include "swad_resource_database.h" /*****************************************************************************/ /************** External global variables from others modules ****************/ @@ -59,7 +59,7 @@ void ForRsc_GetLinkToThread (void) ForRsc_GetTitleFromThrCod (Forums.Thread.Current,Subject,sizeof (Subject) - 1); /***** Copy link to thread into resource clipboard *****/ - Prg_DB_CopyToClipboard (Rsc_FORUM_THREAD,Forums.Thread.Current); + Rsc_DB_CopyToClipboard (Rsc_FORUM_THREAD,Forums.Thread.Current); /***** Write sucess message *****/ Ale_ShowAlert (Ale_SUCCESS,Txt_Link_to_resource_X_copied_into_clipboard, diff --git a/swad_game_resource.c b/swad_game_resource.c index a452b152..08d9adad 100644 --- a/swad_game_resource.c +++ b/swad_game_resource.c @@ -33,7 +33,8 @@ #include "swad_game_database.h" #include "swad_game_resource.h" #include "swad_parameter_code.h" -#include "swad_program_database.h" +#include "swad_resource_database.h" +#include "swad_theme.h" /*****************************************************************************/ /***************************** Get link to game ******************************/ @@ -56,7 +57,7 @@ void GamRsc_GetLinkToGame (void) GamRsc_GetTitleFromGamCod (GamCod,Title,sizeof (Title) - 1); /***** Copy link to game into resource clipboard *****/ - Prg_DB_CopyToClipboard (Rsc_GAME,GamCod); + Rsc_DB_CopyToClipboard (Rsc_GAME,GamCod); /***** Write sucess message *****/ Ale_ShowAlert (Ale_SUCCESS,Txt_Link_to_resource_X_copied_into_clipboard, diff --git a/swad_program_database.c b/swad_program_database.c index 1bf139a5..7e4bbff3 100644 --- a/swad_program_database.c +++ b/swad_program_database.c @@ -644,63 +644,6 @@ void Prg_DB_UpdateRscLink (const struct Prg_Item *Item) Item->Resource.Hierarchy.RscCod); } -/*****************************************************************************/ -/********************** Copy link to resource into clipboard *****************/ -/*****************************************************************************/ - -void Prg_DB_CopyToClipboard (Rsc_Type_t Type,long Cod) - { - extern const char *Rsc_ResourceTypesDB[Rsc_NUM_TYPES]; - - DB_QueryREPLACE ("can not copy link to resource clipboard", - "REPLACE INTO prg_clipboards" - " (UsrCod,CrsCod,Type,Cod,CopyTime)" - " VALUES" - " (%ld,%ld,'%s',%ld,NOW())", - Gbl.Usrs.Me.UsrDat.UsrCod, - Gbl.Hierarchy.Crs.CrsCod, - Rsc_ResourceTypesDB[Type], - Cod); - } - -/*****************************************************************************/ -/**************** Get resources in the current course clipboard **************/ -/*****************************************************************************/ - -unsigned Prg_DB_GetClipboard (MYSQL_RES **mysql_res) - { - return (unsigned) - DB_QuerySELECT (mysql_res,"can not get clipboard", - "SELECT Type," // row[0] - "Cod" // row[1] - " FROM prg_clipboards" - " WHERE UsrCod=%ld" - " AND CrsCod=%ld" - " ORDER BY CopyTime", - Gbl.Usrs.Me.UsrDat.UsrCod, - Gbl.Hierarchy.Crs.CrsCod); - } - -/*****************************************************************************/ -/*************************** Remove link from clipboard **********************/ -/*****************************************************************************/ - -void Prg_DB_RemoveLinkFromClipboard (struct Rsc_Link *Link) - { - extern const char *Rsc_ResourceTypesDB[Rsc_NUM_TYPES]; - - DB_QueryDELETE ("can not remove link from clipboard", - "DELETE FROM prg_clipboards" - " WHERE UsrCod=%ld" - " AND CrsCod=%ld" - " AND Type='%s'" - " AND Cod=%ld", - Gbl.Usrs.Me.UsrDat.UsrCod, - Gbl.Hierarchy.Crs.CrsCod, - Rsc_ResourceTypesDB[Link->Type], - Link->Cod); - } - /*****************************************************************************/ /************************ Insert item in expanded items **********************/ /*****************************************************************************/ diff --git a/swad_program_database.h b/swad_program_database.h index 565ccdd1..f9b527e5 100644 --- a/swad_program_database.h +++ b/swad_program_database.h @@ -77,10 +77,6 @@ void Prg_DB_LockTableResources (void); void Prg_DB_UpdateRscInd (long RscCod,int RscInd); void Prg_DB_UpdateRscLink (const struct Prg_Item *Item); -void Prg_DB_CopyToClipboard (Rsc_Type_t Type,long Cod); -unsigned Prg_DB_GetClipboard (MYSQL_RES **mysql_res); -void Prg_DB_RemoveLinkFromClipboard (struct Rsc_Link *Link); - void Prg_DB_InsertItemInExpandedItems (long ItmCod); bool Prg_DB_GetIfExpandedItem (long ItmCod); void Prg_DB_RemoveItemFromExpandedItems (long ItmCod); diff --git a/swad_program_resource.c b/swad_program_resource.c index b76305ca..a4ea42a2 100644 --- a/swad_program_resource.c +++ b/swad_program_resource.c @@ -40,6 +40,7 @@ #include "swad_parameter_code.h" #include "swad_program.h" #include "swad_program_database.h" +#include "swad_resource_database.h" /*****************************************************************************/ /************** External global variables from others modules ****************/ @@ -890,7 +891,7 @@ static void PrgRsc_ShowClipboard (struct Prg_Item *Item) Rsc_WriteRowClipboard (true,&EmptyLink); /***** Get links in clipboard from database and write them *****/ - NumLinks = Prg_DB_GetClipboard (&mysql_res); + NumLinks = Rsc_DB_GetClipboard (&mysql_res); for (NumLink = 1; NumLink <= NumLinks; NumLink++) @@ -950,7 +951,7 @@ void PrgRsc_ChangeLink (void) Prg_DB_UpdateRscLink (&Item); /***** Remove link from clipboard *****/ - Prg_DB_RemoveLinkFromClipboard (&Item.Resource.Link); + Rsc_DB_RemoveLinkFromClipboard (&Item.Resource.Link); } /***** Show current program items, if any *****/ diff --git a/swad_project_resource.c b/swad_project_resource.c index e038c15f..84f6835b 100644 --- a/swad_project_resource.c +++ b/swad_project_resource.c @@ -34,6 +34,7 @@ #include "swad_project.h" #include "swad_project_database.h" #include "swad_project_resource.h" +#include "swad_resource_database.h" /*****************************************************************************/ /***************************** Get link to game ******************************/ @@ -56,7 +57,7 @@ void PrjRsc_GetLinkToProject (void) PrjRsc_GetTitleFromPrjCod (Projects.Prj.PrjCod,Title,sizeof (Title) - 1); /***** Copy link to PROJECT into resource clipboard *****/ - Prg_DB_CopyToClipboard (Rsc_PROJECT,Projects.Prj.PrjCod); + Rsc_DB_CopyToClipboard (Rsc_PROJECT,Projects.Prj.PrjCod); /***** Write sucess message *****/ Ale_ShowAlert (Ale_SUCCESS,Txt_Link_to_resource_X_copied_into_clipboard, diff --git a/swad_resource_database.c b/swad_resource_database.c new file mode 100644 index 00000000..28af5736 --- /dev/null +++ b/swad_resource_database.c @@ -0,0 +1,93 @@ +// swad_resource_database.c: resources, operations with database + +/* + SWAD (Shared Workspace At a Distance), + is a web platform developed at the University of Granada (Spain), + and used to support university teaching. + + This file is part of SWAD core. + Copyright (C) 1999-2023 Antonio Caņas Vargas + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ +/*****************************************************************************/ +/********************************* Headers ***********************************/ +/*****************************************************************************/ + +#include "swad_database.h" +#include "swad_global.h" +#include "swad_resource.h" + +/*****************************************************************************/ +/************** External global variables from others modules ****************/ +/*****************************************************************************/ + +extern struct Globals Gbl; + +/*****************************************************************************/ +/********************** Copy link to resource into clipboard *****************/ +/*****************************************************************************/ + +void Rsc_DB_CopyToClipboard (Rsc_Type_t Type,long Cod) + { + extern const char *Rsc_ResourceTypesDB[Rsc_NUM_TYPES]; + + DB_QueryREPLACE ("can not copy link to resource clipboard", + "REPLACE INTO rsc_clipboards" + " (UsrCod,CrsCod,Type,Cod,CopyTime)" + " VALUES" + " (%ld,%ld,'%s',%ld,NOW())", + Gbl.Usrs.Me.UsrDat.UsrCod, + Gbl.Hierarchy.Crs.CrsCod, + Rsc_ResourceTypesDB[Type], + Cod); + } + +/*****************************************************************************/ +/**************** Get resources in the current course clipboard **************/ +/*****************************************************************************/ + +unsigned Rsc_DB_GetClipboard (MYSQL_RES **mysql_res) + { + return (unsigned) + DB_QuerySELECT (mysql_res,"can not get clipboard", + "SELECT Type," // row[0] + "Cod" // row[1] + " FROM rsc_clipboards" + " WHERE UsrCod=%ld" + " AND CrsCod=%ld" + " ORDER BY CopyTime", + Gbl.Usrs.Me.UsrDat.UsrCod, + Gbl.Hierarchy.Crs.CrsCod); + } + +/*****************************************************************************/ +/*************************** Remove link from clipboard **********************/ +/*****************************************************************************/ + +void Rsc_DB_RemoveLinkFromClipboard (struct Rsc_Link *Link) + { + extern const char *Rsc_ResourceTypesDB[Rsc_NUM_TYPES]; + + DB_QueryDELETE ("can not remove link from clipboard", + "DELETE FROM rsc_clipboards" + " WHERE UsrCod=%ld" + " AND CrsCod=%ld" + " AND Type='%s'" + " AND Cod=%ld", + Gbl.Usrs.Me.UsrDat.UsrCod, + Gbl.Hierarchy.Crs.CrsCod, + Rsc_ResourceTypesDB[Link->Type], + Link->Cod); + } diff --git a/swad_resource_database.h b/swad_resource_database.h new file mode 100644 index 00000000..faa7e8cc --- /dev/null +++ b/swad_resource_database.h @@ -0,0 +1,40 @@ +// swad_resource_database.h: resources, operations with database + +#ifndef _SWAD_RSC_DB +#define _SWAD_RSC_DB +/* + SWAD (Shared Workspace At a Distance), + is a web platform developed at the University of Granada (Spain), + and used to support university teaching. + + This file is part of SWAD core. + Copyright (C) 1999-2023 Antonio Caņas Vargas + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ +/*****************************************************************************/ +/********************************* Headers ***********************************/ +/*****************************************************************************/ + +#include "swad_resource.h" + +/*****************************************************************************/ +/***************************** Public prototypes *****************************/ +/*****************************************************************************/ + +void Rsc_DB_CopyToClipboard (Rsc_Type_t Type,long Cod); +unsigned Rsc_DB_GetClipboard (MYSQL_RES **mysql_res); +void Rsc_DB_RemoveLinkFromClipboard (struct Rsc_Link *Link); + +#endif diff --git a/swad_rubric_criteria.c b/swad_rubric_criteria.c index 268da000..82d5ad8b 100644 --- a/swad_rubric_criteria.c +++ b/swad_rubric_criteria.c @@ -40,8 +40,7 @@ #include "swad_global.h" #include "swad_parameter.h" #include "swad_parameter_code.h" -#include "swad_program_database.h" -#include "swad_program_resource.h" +#include "swad_resource_database.h" #include "swad_rubric.h" #include "swad_rubric_criteria.h" #include "swad_rubric_database.h" @@ -1213,7 +1212,7 @@ static void RubCri_ShowClipboard (const struct RubCri_Criterion *Criterion,const RubCri_WriteRowClipboard (true,&EmptyLink); */ /***** Get links in clipboard from database and write them *****/ - NumLinks = Prg_DB_GetClipboard (&mysql_res); + NumLinks = Rsc_DB_GetClipboard (&mysql_res); for (NumLink = 1; NumLink <= NumLinks; NumLink++) diff --git a/swad_rubric_resource.c b/swad_rubric_resource.c index 34508aeb..09b6ffa0 100644 --- a/swad_rubric_resource.c +++ b/swad_rubric_resource.c @@ -30,7 +30,7 @@ #include "swad_error.h" #include "swad_form.h" #include "swad_parameter_code.h" -#include "swad_program_database.h" +#include "swad_resource_database.h" #include "swad_rubric.h" #include "swad_rubric_database.h" #include "swad_rubric_resource.h" @@ -55,7 +55,7 @@ void RubRsc_GetLinkToRubric (void) RubRsc_GetTitleFromRubCod (Rubrics.Rubric.RubCod,Title,sizeof (Title) - 1); /***** Copy link to rubric into resource clipboard *****/ - Prg_DB_CopyToClipboard (Rsc_RUBRIC,Rubrics.Rubric.RubCod); + Rsc_DB_CopyToClipboard (Rsc_RUBRIC,Rubrics.Rubric.RubCod); /***** Write sucess message *****/ Ale_ShowAlert (Ale_SUCCESS,Txt_Link_to_resource_X_copied_into_clipboard, diff --git a/swad_survey_resource.c b/swad_survey_resource.c index f6847e44..cffeffd0 100644 --- a/swad_survey_resource.c +++ b/swad_survey_resource.c @@ -30,7 +30,7 @@ #include "swad_error.h" #include "swad_form.h" #include "swad_parameter_code.h" -#include "swad_program_database.h" +#include "swad_resource_database.h" #include "swad_survey.h" #include "swad_survey_database.h" #include "swad_survey_resource.h" @@ -55,7 +55,7 @@ void SvyRsc_GetLinkToSurvey (void) SvyRsc_GetTitleFromSvyCod (Surveys.Svy.SvyCod,Title,sizeof (Title) - 1); /***** Copy link to survey into resource clipboard *****/ - Prg_DB_CopyToClipboard (Rsc_SURVEY,Surveys.Svy.SvyCod); + Rsc_DB_CopyToClipboard (Rsc_SURVEY,Surveys.Svy.SvyCod); /***** Write sucess message *****/ Ale_ShowAlert (Ale_SUCCESS,Txt_Link_to_resource_X_copied_into_clipboard,