Changeset 11149

Timestamp:

06/05/08 15:58:33 (4 years ago)

Author:

sys

Message:

viewObject : getContent avec transformation : renvoit le mimetype.

Location:

trunk

Files:

• Jav_BDP/com/scenari/m/bdp/itemcontent/IHResource.java (modified) (1 diff)
• Jav_BDP/com/scenari/m/bdp/itemcontent/base/XResource.java (modified) (3 diffs)
• Jav_BDP/com/scenari/m/bdp/service/viewobject/HResultatStream.java (modified) (1 diff)
• Jav_BDP/com/scenari/m/bdp/service/viewobject/HSDialogViewObject.java (modified) (4 diffs)
• Jav_BDP_FS/com/scenari/m/bdp/item/fs/HContentAccessFs.java (modified) (2 diffs)

trunk/Jav_BDP/com/scenari/m/bdp/itemcontent/IHResource.java

@@ -48 +48 @@
         public InputStream hGetInputStream() throws Exception;
         
+        public String hGetContentType() throws Exception;
+        
 }

trunk/Jav_BDP/com/scenari/m/bdp/itemcontent/base/XResource.java

@@ -61 +61 @@
         protected InputStream fInputStream = null;
 
+        protected String fContentType = null;
+
         protected Date fLastUpdt = null;
     
@@ -107 +109 @@
         public final Date hGetLastModif() throws Exception {
                 return fLastUpdt;
+        }
+        
+        public String hGetContentType() throws Exception {
+                return fContentType;
         }
 
@@ -164 +170 @@
         fRights = pRights;
     }
+
+        public void hSetContentType(String pContentType) {
+                fContentType = pContentType;
+        }
+    
 }

trunk/Jav_BDP/com/scenari/m/bdp/service/viewobject/HResultatStream.java

@@ -61 +61 @@
                 hSetContentType("");
         }
+        
+        /**
+         * Construit une réponse pur le renvoi d'un fichier.
+         * Si un nom (pName) est passé en paramètre, un téléchargement sera effectué,
+         * sinon, une tentative d'ouverture dans le navigateur sera réalisée.
+         */
+        public HResultatStream(InputStream pStream, int pSize, long pLastUpdt, String pName, String pMimeType) {
+                super();
+                hSetInputStream(pStream);
+                hSetLength(pSize);
+                hSetLastModifDate(pLastUpdt);
+                hSetDownloadNameFile(pName);
+                hSetContentType(pMimeType);
+        }
 
 }

trunk/Jav_BDP/com/scenari/m/bdp/service/viewobject/HSDialogViewObject.java

@@ -508 +508 @@
                                                                                                         String vPath = vSrc.hGetUrlFileFormat();
                                                                                                         byte[] vRes = vPath != null ? vPath.getBytes("utf8") : new byte[0];
-                                                                                                        fResultatStream = new HResultatStream(new ByteArrayInputStream(vRes), vRes.length, vSrc.hGetLastModifWithChilds(), null);
-                                                                                                        ((HResultatStream) fResultatStream).hSetContentType("text/plain");
+                                                                                                        fResultatStream = new HResultatStream(new ByteArrayInputStream(vRes), vRes.length, vSrc.hGetLastModifWithChilds(), null, "text/plain");
                                                                                                 } else {
                                                                                                         fResultatStream = new WResultatError(HWebdavCodes.SC_FORBIDDEN);
@@ -515 +514 @@
                                                                                         } else {
                                                                                                 String vName = xGetFileNameForDownload(vCdAction);
-                                                                                                fResultatStream = new HResultatStream(vSrc.hGetInputStream(), vSrc.hGetSize(), vSrc.hGetLastModif(), vName);
-                                                                                                ((HResultatStream) fResultatStream).hSetContentType(vSrc.hGetContentType());
+                                                                                                fResultatStream = new HResultatStream(vSrc.hGetInputStream(), vSrc.hGetSize(), vSrc.hGetLastModif(), vName, vSrc.hGetContentType());
                                                                                         }
                                                                                 }
@@ -530 +528 @@
                                                                                 String vPath = fWorkspace.hGetRepository().hGetContentAccess().hGetUrlFileFormat(vItemDef.hGetId(), null, hGetUriRes(), vQs, null);
                                                                                 byte[] vRes = vPath != null ? vPath.getBytes("utf8") : new byte[0];
-                                                                                fResultatStream = new HResultatStream(new ByteArrayInputStream(vRes), vRes.length, System.currentTimeMillis(), null);
-                                                                                ((HResultatStream) fResultatStream).hSetContentType("text/plain");
+                                                                                fResultatStream = new HResultatStream(new ByteArrayInputStream(vRes), vRes.length, System.currentTimeMillis(), null, "text/plain");
                                                                         } else {
                                                                                 fResultatStream = new WResultatError(HWebdavCodes.SC_FORBIDDEN);
@@ -539 +536 @@
                                                                         if (vRes != null) {
                                                                                 String vName = xGetFileNameForDownload(vCdAction);
-                                                                                fResultatStream = new HResultatStream(vRes.hGetInputStream(), vRes.hGetLength(), vRes.hGetLastModif().getTime(), vName);
+                                                                                fResultatStream = new HResultatStream(vRes.hGetInputStream(), vRes.hGetLength(), vRes.hGetLastModif().getTime(), vName, vRes.hGetContentType());
                                                                         } else {
                                                                                 fResultatStream = new WResultatError(HWebdavCodes.SC_NOT_FOUND);

trunk/Jav_BDP_FS/com/scenari/m/bdp/item/fs/HContentAccessFs.java

@@ -262 +262 @@
                                 vRes.hSetLength(vSource.hGetSize());
                                 vRes.hSetInputStream(vSource.hGetInputStream());
+                                vRes.hSetContentType(vItem.hGetItemType().hGetContentFormat());
                         } else {
                                 vRes.hSetLastModif(new Date(vSource.hGetLastModifWithChilds()));
@@ -277 +278 @@
                                 vRes.hSetLength((int) vFile.length());
                                 vRes.hSetInputStream(new BufferedInputStream(new FileInputStream(vFile)));
+                                //On renseigne le mimetype.
+                                HTransformParams vLastTransform = pTransforms.hGetLastTransform();
+                                IHTransformer vTransformer = HTransformerMgr.hGetTransformerMgr(null).hGetTransformer(vLastTransform);
+                                vRes.hSetContentType(vTransformer.hGetMimeType(pTransforms.hGetLastTransform()));
                         }
                 }