Author: tdraier
Date: Tue May 22 16:14:08 2007
New Revision: 17344
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17344&repname=
=3Djahia
Log:
don't extract document from folders (DOC-202)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana=
ger/info.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/fi=
lemanager/info.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/info.jsp&rev=3D17344&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana=
ger/info.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana=
ger/info.jsp Tue May 22 16:14:08 2007
@@ -180,8 +180,11 @@
<%
final long lastModifiedDate =3D objectDav.getRevisionDescriptor().getL=
astModifiedAsDate().getTime();
final String contentType =3D (String) objectDav.getProperty("DAV:", "g=
etcontenttype");
- final ExtractedDocument extDoc =3D ServicesRegistry.getInstance().getF=
ileExtractionService().
+ ExtractedDocument extDoc =3D null;
+ if (!objectDav.isCollection()) {
+ extDoc =3D ServicesRegistry.getInstance().getFileExtractionService=
().
getExtractedDocument(contentType, objectDav.getPath(), las=
tModifiedDate, true, objectDav.downloadFile());
+ }
%>
<table width=3D"100%">
<tr>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
