diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/detailArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/detailArticle.jsp index 28165eb..7fe7201 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/detailArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/detailArticle.jsp @@ -1,32 +1,33 @@ -<%@ include file="/WEB-INF/decorators/include.jsp"%> - - - -<fmt:message key="detail.title"/> - - +<%@ include file="/WEB-INF/decorators/include.jsp"%> -
-

${article.title}

-

Author: ${article.mainAuthor.firstName} ${article.mainAuthor.lastName}

- -

- Secondary Authors: -

- - -

Topic: ${article.topic}

-

State of article: ${article.state}

-

Article's details + +

+

${article.title}

+

Author: ${article.mainAuthor.firstName} +${article.mainAuthor.lastName}

+ +

Secondary Authors: +

    + +
  • ${sAuthor}
    • +     +
+ + +

Topic: ${article.topic}

+

State of article: ${article.state}

+

- ">Download the article -

- -
- + ">Download

+ +
+ \ No newline at end of file diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java index 91209ea..eda96d3 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java @@ -237,7 +237,7 @@ public class EvaluationController extends SimpleFormController { for(SimpleCriterion sc : liste) { Rating rt = new Rating(); for (Rating r : ratings) { - if (r.getCriterion().getId() == sc.getId()) { + if (r.getCriterion().getId().intValue() == sc.getId().intValue()) { rt = r; } } diff --git a/YACOSWeb/src/org/yacos/web/author/controller/DetailArticleController.java b/YACOSWeb/src/org/yacos/web/author/controller/DetailArticleController.java index 729f939..809ca2b 100644 --- a/YACOSWeb/src/org/yacos/web/author/controller/DetailArticleController.java +++ b/YACOSWeb/src/org/yacos/web/author/controller/DetailArticleController.java @@ -9,26 +9,37 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.ModelAndViewDefiningException; import org.springframework.web.servlet.mvc.SimpleFormController; import org.yacos.core.article.Article; import org.yacos.core.article.IArticleManager; public class DetailArticleController extends SimpleFormController { - protected final Log logger = LogFactory.getLog(getClass()); - private IArticleManager articleManager; + protected final Log logger = LogFactory.getLog(getClass()); + private IArticleManager articleManager; - public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { - logger.info("Returning main view"); - String id=request.getParameter("id"); - System.out.println("article's id is "+id); - Integer idd=new Integer(Integer.parseInt(id)); - Article article=articleManager.getArticle(idd); - //FIXME - return new ModelAndView("detailArticle","article",article); - } + logger.info("Returning details view"); + + String articleId = request.getParameter("id"); + + try { + Integer id = new Integer(articleId); + + Article article = articleManager.getArticle(id); + + if (article == null) + throw new ModelAndViewDefiningException(new ModelAndView("404error")); + + return new ModelAndView("detailArticle", "article", article); + } + catch (NumberFormatException e) { + throw new ModelAndViewDefiningException(new ModelAndView("404error")); + } + } public IArticleManager getArticleManager() { return articleManager; diff --git a/YACOSWeb/src/org/yacos/web/author/controller/MainController.java b/YACOSWeb/src/org/yacos/web/author/controller/MainController.java index 627b745..bdefe48 100644 --- a/YACOSWeb/src/org/yacos/web/author/controller/MainController.java +++ b/YACOSWeb/src/org/yacos/web/author/controller/MainController.java @@ -20,7 +20,6 @@ public class MainController extends SimpleFormController { logger.info("Returning main view"); - //FIXME return new ModelAndView("main"); } } \ No newline at end of file diff --git a/YACOSWeb/src/org/yacos/web/system/controller/ArticleDownloadController.java b/YACOSWeb/src/org/yacos/web/system/controller/ArticleDownloadController.java index c7f49b2..72a729f 100644 --- a/YACOSWeb/src/org/yacos/web/system/controller/ArticleDownloadController.java +++ b/YACOSWeb/src/org/yacos/web/system/controller/ArticleDownloadController.java @@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse; import org.springframework.util.FileCopyUtils; import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.ModelAndViewDefiningException; import org.springframework.web.servlet.mvc.Controller; import org.springframework.web.servlet.view.RedirectView; import org.yacos.core.article.Article; @@ -87,8 +88,7 @@ public class ArticleDownloadController implements Controller { response.getOutputStream().close(); } catch(NumberFormatException e){ - // TODO : display something - return null; + throw new ModelAndViewDefiningException(new ModelAndView("404error")); } return null; diff --git a/YACOSWeb/src/org/yacos/web/system/session/SessionService.java b/YACOSWeb/src/org/yacos/web/system/session/SessionService.java index 45fecbf..37dfdbd 100644 --- a/YACOSWeb/src/org/yacos/web/system/session/SessionService.java +++ b/YACOSWeb/src/org/yacos/web/system/session/SessionService.java @@ -68,7 +68,6 @@ public class SessionService { //request.setAttribute("nbUserConferences",getNbUserConferences()); } catch (NamingException e) { - // TODO Auto-generated catch block e.printStackTrace(); } }