You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by jw...@apache.org on 2005/05/09 14:55:59 UTC

svn commit: r169308 - /lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Overview.java

Author: jwkaltz
Date: Mon May  9 05:55:58 2005
New Revision: 169308

URL: http://svn.apache.org/viewcvs?rev=169308&view=rev
Log:
read meta-data directly instead of using DocumentTypeResolver

Modified:
    lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Overview.java

Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Overview.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Overview.java?rev=169308&r1=169307&r2=169308&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Overview.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Overview.java Mon May  9 05:55:58 2005
@@ -18,8 +18,6 @@
 
 import org.apache.lenya.cms.metadata.MetaData;
 import org.apache.lenya.cms.metadata.dublincore.DublinCore;
-import org.apache.lenya.cms.publication.DocumentType;
-import org.apache.lenya.cms.publication.DocumentTypeResolver;
 import org.apache.lenya.cms.site.usecases.SiteUsecase;
 import org.apache.lenya.cms.usecase.UsecaseException;
 
@@ -43,25 +41,22 @@
     protected void initParameters() {
         super.initParameters();
 
-        DocumentTypeResolver doctypeResolver = null;
         try {
+            // read parameters from Dublin Core meta-data
             MetaData dc = (MetaData) getSourceDocument().getMetaDataManager().getDublinCoreMetaData();
-            setParameter("languages", getSourceDocument().getLanguages());
-            setParameter("title", dc.getFirstValue(DublinCore.ELEMENT_TITLE));
+            setParameter(DublinCore.ELEMENT_TITLE, dc.getFirstValue(DublinCore.ELEMENT_TITLE));
+            setParameter(DublinCore.ELEMENT_DESCRIPTION, dc.getFirstValue(DublinCore.ELEMENT_DESCRIPTION));
 
-            doctypeResolver = (DocumentTypeResolver) this.manager.lookup(DocumentTypeResolver.ROLE);
-            DocumentType doctype = doctypeResolver.resolve(getSourceDocument());
+            // read parameters from document attributes
+            setParameter("languages", getSourceDocument().getLanguages());
             setParameter("languages", getSourceDocument().getLanguages());
-            setParameter("lastmodified", getSourceDocument().getLastModified());
-            setParameter("resourcetype", doctype.getName());
+            setParameter("lastmodified", getSourceDocument().getLastModified());     
+            setParameter("resourcetype", getSourceDocument().getResourceType());           
             setParameter("live", "");
+
         } catch (final Exception e) {
             addErrorMessage("Could not read a value. See log files for details.");
             getLogger().error("Could not read value for Overview usecase. ", e);
-        } finally {
-            if (doctypeResolver != null) {
-                this.manager.release(doctypeResolver);
-            }
         }
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org