From b86b3f2c2c3ce8c23ca4dcb82e31f0ccddd56c08 Mon Sep 17 00:00:00 2001
From: Fnac <Fnac@LAPTOP-KVHFJG6E>
Date: Thu, 23 May 2019 10:38:19 +0200
Subject: [PATCH] Arreglando nuestra cagada (pero la culpa es de cabero je)
---
Source Packages/servlet/autorSV.java | 2 +-
Source Packages/servlet/borrarArchivoSV.java | 1 -
Source Packages/servlet/borrarComentarioSV.java | 1 -
Source Packages/servlet/borrarNookSV.java | 1 -
Source Packages/servlet/buscarSV.java | 1 -
Source Packages/servlet/cerrarSesionSV.java | 1 -
Source Packages/servlet/descargarNookSV.java | 1 -
Source Packages/servlet/documentosSV.java | 1 -
Source Packages/servlet/inicialSV.java | 1 -
Source Packages/servlet/mensajeSV.java | 1 -
Source Packages/servlet/nookSV.java | 1 -
Source Packages/servlet/registroSV.java | 1 -
web/js/bdFilenook.sql | 17 -----------------
13 files changed, 1 insertion(+), 29 deletions(-)
diff --git a/Source Packages/servlet/autorSV.java b/Source Packages/servlet/autorSV.java
index 602cf45..9c91029 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 d7556ee..deef3a3 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 3d51741..a582cf4 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 1122304..1137324 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 6cc3571..edabd62 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 afbad8a..307c8af 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 b4f37bf..7678a0d 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 97890e2..8e4a7c2 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 0f44757..ab6c120 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 3250168..5ba9b4f 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 00273e6..a16ed19 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 4289f76..40832be 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 90a485d..aeb39a9 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');
--
GitLab