You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/02/28 01:28:05 UTC
svn commit: r155652 - in lenya/trunk/src:
java/org/apache/lenya/cms/site/usecases/Assets.java
java/org/apache/lenya/cms/site/usecases/SiteUsecase.java
webapp/lenya/usecases/tab/assets.jx
Author: gregor
Date: Sun Feb 27 16:28:04 2005
New Revision: 155652
URL: http://svn.apache.org/viewcvs?view=rev&rev=155652
Log:
Enhanced assets usecase to actually show existing assets ;)
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Assets.java
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/SiteUsecase.java
lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Assets.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Assets.java?view=diff&r1=155651&r2=155652
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Assets.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Assets.java Sun Feb 27 16:28:04 2005
@@ -16,15 +16,22 @@
*/
package org.apache.lenya.cms.site.usecases;
+import java.io.File;
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
import java.util.Map;
import org.apache.cocoon.servlet.multipart.Part;
import org.apache.lenya.cms.publication.ResourcesManager;
import org.apache.lenya.cms.site.usecases.SiteUsecase;
import org.apache.lenya.cms.usecase.UsecaseException;
+import org.apache.lenya.xml.DocumentHelper;
/**
- * Usecase to Assets a resource.
+ * Usecase to add Assets to a resource.
*
* @version $Id: Assets.java 123984 2005-01-03 15:02:18Z andreas $
*/
@@ -32,13 +39,6 @@
private ResourcesManager resourcesManager = null;
- /**
- * Ctor.
- */
- public Assets() {
- super();
- }
-
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#doInitialize()
*/
@@ -68,6 +68,39 @@
}
/**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
+ */
+ protected void initParameters() {
+ super.initParameters();
+ File[] resources = this.resourcesManager.getResources();
+
+ if (resources != null) {
+ Map[] assets = new Map[resources.length];
+
+ for(int i = 0; i < resources.length; i++) {
+ Map asset = new HashMap();
+ String title = "";
+ String format = "";
+ org.w3c.dom.Document metaDoc;
+ try {
+ metaDoc = DocumentHelper.readDocument(this.resourcesManager.getMetaFile(resources[i]));
+ title = metaDoc.getElementsByTagNameNS("http://purl.org/dc/elements/1.1/", "title").item(0).getChildNodes().item(0).getNodeValue();
+ format = metaDoc.getElementsByTagNameNS("http://purl.org/dc/elements/1.1/", "format").item(0).getChildNodes().item(0).getNodeValue();
+ } catch(final Exception e) {
+ throw new RuntimeException(e);
+ }
+ asset.put("source", resources[i].getName());
+ asset.put("title", title);
+ asset.put("date", DateFormat.getDateInstance().format(new Date(resources[i].lastModified())));
+ asset.put("format", format);
+ asset.put("extent", new Long(resources[i].length()/1024));
+ assets[i] = asset;
+ }
+ setParameter("assets", assets);
+ }
+ }
+
+ /**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#doExecute()
*/
protected void doExecute() throws Exception {
@@ -83,15 +116,9 @@
metadata.put("rights",rights);
try {
this.resourcesManager.addResource(file, metadata);
- } catch (Exception e) {
+ } catch (final Exception e) {
addErrorMessage("The resource could not be added.");
}
}
- /**
- * @see org.apache.lenya.cms.usecase.Usecase#setParameter(java.lang.String, java.lang.Object)
- */
- public void setParameter(String name, Object value) {
- super.setParameter(name, value);
- }
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/SiteUsecase.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/SiteUsecase.java?view=diff&r1=155651&r2=155652
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/SiteUsecase.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/SiteUsecase.java Sun Feb 27 16:28:04 2005
@@ -34,18 +34,12 @@
protected WorkflowInstance instance = null;
protected static final String AREA = "area";
protected static final String DOCUMENTID = "documentid";
+ protected static final String DOCUMENTNAME = "documentname";
protected static final String LANGUAGEEXISTS = "languageexists";
protected static final String STATE = "state";
protected static final String ISLIVE = "is_live";
/**
- * Ctor.
- */
- public SiteUsecase() {
- super();
- }
-
- /**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#doInitialize()
/*TODO make common parameters available to site usecases: area, documentid, languageexists etc
* may need to take special areas into acccount, such as info-authoring */
@@ -70,6 +64,7 @@
setParameter(AREA, this.doc.getArea());
setParameter(DOCUMENTID, this.doc.getId());
+ setParameter(DOCUMENTNAME, this.doc.getName());
setParameter(LANGUAGEEXISTS, "true");
}
Modified: lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx?view=diff&r1=155651&r2=155652
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx Sun Feb 27 16:28:04 2005
@@ -104,7 +104,7 @@
<td><jx:out value="${item.source}"/></td>
<td>
<jx:if test="${item.format.equals('image/jpeg') or item.format.equals('image/gif') or item.format.equals('image/png')}">
- <img src="../authoring/${usecase.getParameter('documentnodeid')}/${item.source}" style="height: 32px; vertical-align: middle;"/> 
+ <img src="../authoring/${usecase.getParameter('documentname')}/${item.source}" style="height: 32px; vertical-align: middle;"/> 
</jx:if>
</td>
<td><jx:out value="${item.title}"/></td>
@@ -123,8 +123,8 @@
</tr>
</jx:forEach>
</table>
-<!-- <jx:if test="${usecase.getParameter('area').equals('authoring')}">
---> <form>
+ <jx:if test="${usecase.getParameter('area').equals('authoring')}">
+ <form>
<input type="hidden" name="lenya.usecase" value="tab.asset"/>
<input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
<table class="lenya-table-noborder">
@@ -168,7 +168,7 @@
</tr>
</table>
</form>
-<!-- </jx:if>
---> </div>
+ </jx:if>
+ </div>
</div>
</page:page>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org
Re: svn commit: r155652 - in lenya/trunk/src: java/org/apache/lenya/cms/site/usecases/Assets.java
java/org/apache/lenya/cms/site/usecases/SiteUsecase.java webapp/lenya/usecases/tab/assets.jx
Posted by Andreas Hartmann <an...@apache.org>.
gregor@apache.org wrote:
> + title = metaDoc.getElementsByTagNameNS("http://purl.org/dc/elements/1.1/", "title").item(0
> .getChildNodes().item(0).getNodeValue();
This might be critical. In some cases, XML documents can look like
<hello>foo bar</hello>
- element node <hello>
- text node "foo"
- text node " "
- text node "bar"
This will probably not happen when you read the plain file, but
it can happen e.g. after an XSL transformation:
<hello>
<xsl:text>foo</xsl:text>
<xsl:text> </xsl:text>
<xsl:text>bar</xsl:text>
Before normalizing the document, it contains 3 subsequent text nodes.
In this case, .getChildNodes().item(0).getNodeValue(); will return "foo"
instead of "foo bar".
You can always use DocumentHelper.getSimpleElementText() safely.
-- Andreas
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org