diff --git a/Source Packages/servlet/autorSV.java b/Source Packages/servlet/autorSV.java index 602cf45c44b92359284c485b60671b20dc96d45e..9c9102965fba7c1d88bcb6299f7092112bcb6731 100644 --- a/Source Packages/servlet/autorSV.java +++ b/Source Packages/servlet/autorSV.java @@ -47,7 +47,7 @@ public class autorSV extends HttpServlet { RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(url); dispatcher.forward(request, response); }else{ - String nombre = (String) session.getAttribute("usuario"); + String nombre = (String) request.getParameter("nombre"); Usuario usuario = usuarioDB.getUsuario(nombre); diff --git a/Source Packages/servlet/borrarArchivoSV.java b/Source Packages/servlet/borrarArchivoSV.java index d7556ee093132abb63f6cc435801c946a3a515a1..deef3a3e2d5d498712a0c39d4d38a10ff86715d1 100644 --- a/Source Packages/servlet/borrarArchivoSV.java +++ b/Source Packages/servlet/borrarArchivoSV.java @@ -40,7 +40,6 @@ public class borrarArchivoSV extends HttpServlet { RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(url); dispatcher.forward(request, response); }else{ - String userName = (String) session.getAttribute("usuario"); String nombre = request.getParameter("nombre"); int idNook = Integer.parseInt(request.getParameter("idNook")); diff --git a/Source Packages/servlet/borrarComentarioSV.java b/Source Packages/servlet/borrarComentarioSV.java index 3d51741b22e0cd292036088d86127ba3c4db30d9..a582cf4408d13ff54291f855f80e4b863d721269 100644 --- a/Source Packages/servlet/borrarComentarioSV.java +++ b/Source Packages/servlet/borrarComentarioSV.java @@ -41,7 +41,6 @@ public class borrarComentarioSV extends HttpServlet { RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(url); dispatcher.forward(request, response); } else{ - String userName = (String) session.getAttribute("usuario"); int idComentario = Integer.parseInt(request.getParameter("idComentario")); int idNook = Integer.parseInt(request.getParameter("idNook")); diff --git a/Source Packages/servlet/borrarNookSV.java b/Source Packages/servlet/borrarNookSV.java index 1122304309ba322e12e15122b46a466f1600ba1b..1137324ab34700c15751040184a06fd5a38ba07f 100644 --- a/Source Packages/servlet/borrarNookSV.java +++ b/Source Packages/servlet/borrarNookSV.java @@ -41,7 +41,6 @@ public class borrarNookSV extends HttpServlet { RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(url); dispatcher.forward(request, response); } else { - String userName = (String) session.getAttribute("usuario"); int idNook = Integer.parseInt(request.getParameter("idNook")); diff --git a/Source Packages/servlet/buscarSV.java b/Source Packages/servlet/buscarSV.java index 6cc357180dedbb413fb69aeaa4cd7be233604294..edabd626c6d5adf3122a6e5bd3fd187195bb96b8 100644 --- a/Source Packages/servlet/buscarSV.java +++ b/Source Packages/servlet/buscarSV.java @@ -44,7 +44,6 @@ public class buscarSV extends HttpServlet { RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(url); dispatcher.forward(request, response); }else{ - String userName = (String) session.getAttribute("usuario"); String busqueda= request.getParameter("search"); ArrayList<String> categoriasNook; diff --git a/Source Packages/servlet/cerrarSesionSV.java b/Source Packages/servlet/cerrarSesionSV.java index afbad8ad66b7eb4867fc8d237aff7756d9463636..307c8afff08cbf25d19fcd87631f059a10b64046 100644 --- a/Source Packages/servlet/cerrarSesionSV.java +++ b/Source Packages/servlet/cerrarSesionSV.java @@ -40,7 +40,6 @@ public class cerrarSesionSV extends HttpServlet { RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(url); dispatcher.forward(request, response); }else{ - String userName = (String) session.getAttribute("usuario"); session.invalidate(); String url = "/index.html"; RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(url); diff --git a/Source Packages/servlet/descargarNookSV.java b/Source Packages/servlet/descargarNookSV.java index b4f37bfcdf839f8248466ce20c1137acc1ee336a..7678a0dbe0a11c5e521f3c2b627ca4fb748ad023 100644 --- a/Source Packages/servlet/descargarNookSV.java +++ b/Source Packages/servlet/descargarNookSV.java @@ -54,7 +54,6 @@ public class descargarNookSV extends HttpServlet { RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(url); dispatcher.forward(request, response); }else{ - String userName = (String) session.getAttribute("usuario"); boolean doc = true; int nook = Integer.parseInt(request.getParameter("idNook")); ArrayList<Documento> documentos = documentoDB.getDocumentosNook(nook); diff --git a/Source Packages/servlet/documentosSV.java b/Source Packages/servlet/documentosSV.java index 97890e2f454a49e4b8b08cecabb3ced7cb6fbf87..8e4a7c2d007d40cfd7e4c556f43181a7c1863eac 100644 --- a/Source Packages/servlet/documentosSV.java +++ b/Source Packages/servlet/documentosSV.java @@ -45,7 +45,6 @@ public class documentosSV extends HttpServlet { RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(url); dispatcher.forward(request, response); }else{ - String userName = (String) session.getAttribute("usuario"); int idNook = Integer.parseInt(request.getParameter("idNook")); Nook nook = nookDB.getNook(idNook); diff --git a/Source Packages/servlet/inicialSV.java b/Source Packages/servlet/inicialSV.java index 0f447574c4c4555b4cfc8153fc0b3e135a17dcea..ab6c12096a13ddefc70a10c92a31a3c550195a6b 100644 --- a/Source Packages/servlet/inicialSV.java +++ b/Source Packages/servlet/inicialSV.java @@ -43,7 +43,6 @@ public class inicialSV extends HttpServlet { RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(url); dispatcher.forward(request, response); }else{ - String userName = (String) session.getAttribute("usuario"); ArrayList<Nook> nooksPopulares =nookDB.getNooksPopulares(); ArrayList<Nook> nooksDescargas =nookDB.getNooksDescargas(); diff --git a/Source Packages/servlet/mensajeSV.java b/Source Packages/servlet/mensajeSV.java index 3250168622151a8f93a73fec0c2a407485f1026d..5ba9b4f9524203c4cf61a7b7ce360ee89627b0e5 100644 --- a/Source Packages/servlet/mensajeSV.java +++ b/Source Packages/servlet/mensajeSV.java @@ -41,7 +41,6 @@ public class mensajeSV extends HttpServlet { RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(url); dispatcher.forward(request, response); }else{ - String userName = (String) session.getAttribute("usuario"); int idMensaje = Integer.parseInt(request.getParameter("idMensaje")); String tipo = request.getParameter("tipo"); diff --git a/Source Packages/servlet/nookSV.java b/Source Packages/servlet/nookSV.java index 00273e6be7f321e916cfa3a644380374171b014d..a16ed1953f846a5152b1d586b8b9aa220065524a 100644 --- a/Source Packages/servlet/nookSV.java +++ b/Source Packages/servlet/nookSV.java @@ -47,7 +47,6 @@ public class nookSV extends HttpServlet { RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(url); dispatcher.forward(request, response); }else{ - String userName = (String) session.getAttribute("usuario"); int idNook = Integer.parseInt(request.getParameter("idNook")); Nook nook = nookDB.getNook(idNook); int valoracion = valoracionesNookDB.getValoracionUsuarioNook((String) session.getAttribute("usuario"), idNook); diff --git a/Source Packages/servlet/registroSV.java b/Source Packages/servlet/registroSV.java index 4289f764d48282d7dff50538d52940a2556902e6..40832be8d3d10f7819bb48806077c1b0b391eef3 100644 --- a/Source Packages/servlet/registroSV.java +++ b/Source Packages/servlet/registroSV.java @@ -42,7 +42,6 @@ public class registroSV extends HttpServlet { RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(url); dispatcher.forward(request, response); } else{ - String userName = (String) session.getAttribute("usuario"); String correo = request.getParameter("email"); String nombre = request.getParameter("nom"); String apellidos = request.getParameter("ape"); diff --git a/web/js/bdFilenook.sql b/web/js/bdFilenook.sql index 90a485df15b70b7f73fdc7e3b95c3132b2f21775..aeb39a967a31263a1a09845caa4326c917cc6ed8 100644 --- a/web/js/bdFilenook.sql +++ b/web/js/bdFilenook.sql @@ -2,7 +2,6 @@ DROP TABLE ClasificacionCategorias; DROP TABLE ValoracionesComentario; DROP TABLE Comentario; DROP TABLE ValoracionesNook; -DROP TABLE ValoracionesAutor; DROP TABLE Documento; DROP TABLE Nook; DROP TABLE Mensaje; @@ -67,18 +66,6 @@ CREATE TABLE Documento( ); -CREATE TABLE ValoracionesAutor( - autor VARCHAR(10) NOT NULL, - usuario VARCHAR(10) NOT NULL, - puntuacion NUMERIC(3,1) NOT NULL, - PRIMARY KEY (autor, usuario), - CONSTRAINT FK_VALAUTOR FOREIGN KEY (autor) - REFERENCES Usuario (nombreUsuario), - CONSTRAINT FK_VALAUTOR2 FOREIGN KEY (usuario) - REFERENCES Usuario (nombreUsuario) -); - - CREATE TABLE ValoracionesNook( nook INTEGER NOT NULL, usuario VARCHAR(10) NOT NULL, @@ -186,10 +173,6 @@ INSERT INTO Documento (nook,nombre,resumen,fechaCreacion,fechaModificacion) VALU INSERT INTO Documento (nook,nombre,resumen,fechaCreacion,fechaModificacion) VALUES (13,'Criptomonedas.pdf','Actualidad. Resumen y diferencias entre criptomoneda, moneda virtual y dinero digital.','2018-10-12','2018-10-12'); -INSERT INTO ValoracionesAutor VALUES ('rafhige','patagua',2); -INSERT INTO ValoracionesAutor VALUES ('rafhige','sanblas',4); - - INSERT INTO ValoracionesNook VALUES (0,'patagua',5,'2016-11-12'); INSERT INTO ValoracionesNook VALUES (0,'sanblas',3,'2017-08-06'); INSERT INTO ValoracionesNook VALUES (0,'andcabe',4,'2018-05-15');