[Castore-commits] VisualiserNoticeAction.java 1.7 1.8

[Céline BENOIT]

Update of /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/actions/documents
In directory adullact1:/tmp/cvs-serv15886/src/java/fr/emn/castor/struts/actions/documents

Modified Files:
	VisualiserNoticeAction.java 
Log Message:
récupère de la valeur de docId pour la visualisation dans visualisationMedia.jsp
mise en page

Index: VisualiserNoticeAction.java
===================================================================
RCS file: /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/actions/documents/VisualiserNoticeAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** VisualiserNoticeAction.java	28 Apr 2006 16:52:25 -0000	1.7
--- VisualiserNoticeAction.java	11 May 2006 09:32:58 -0000	1.8
***************
*** 73,92 ****
              final HttpServletResponse response) throws Exception {
  
-         //        Facade fDoc = Facade.getInstance();
          IDocuments fDoc = CastorProxy.getModuleDocuments(request
              .getSession());
          // on recupere l'id passe en parametre...
          String id = request.getParameter("id");
! 
          try {
              ServletOutputStream out = response.getOutputStream();
-             
              response.setContentType(PropertiesHelper.getProperty(
                  DocumentsConstants.EXTENSION, "mime.html"));
-     
              fDoc.transformeNotice(id, DocumentsConstants.HTML, out);
-             
              return null;
!         } catch(DocTransException dte) {
              ActionMessages errors = new ActionMessages();
              errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
--- 73,91 ----
              final HttpServletResponse response) throws Exception {
  
          IDocuments fDoc = CastorProxy.getModuleDocuments(request
              .getSession());
          // on recupere l'id passe en parametre...
          String id = request.getParameter("id");
!         // récupère docId pour la visualisation dans visualisationMedia.jsp
!         if (id == null) {
!             id = (String) request.getSession().getAttribute("docId");
!         }
          try {
              ServletOutputStream out = response.getOutputStream();
              response.setContentType(PropertiesHelper.getProperty(
                  DocumentsConstants.EXTENSION, "mime.html"));
              fDoc.transformeNotice(id, DocumentsConstants.HTML, out);
              return null;
!         } catch (DocTransException dte) {
              ActionMessages errors = new ActionMessages();
              errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(