You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by th...@apache.org on 2006/02/09 12:51:57 UTC
svn commit: r376269 - in /lenya/trunk/src:
java/org/apache/lenya/cms/metadata/usecases/Metadata.java
webapp/lenya/usecases/tab/meta.jx
Author: thorsten
Date: Thu Feb 9 03:51:55 2006
New Revision: 376269
URL: http://svn.apache.org/viewcvs?rev=376269&view=rev
Log:
Using prefixed names for the metadata to prevent clashes in naming from dc and custom metadata
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/metadata/usecases/Metadata.java
lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx
Modified: lenya/trunk/src/java/org/apache/lenya/cms/metadata/usecases/Metadata.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/metadata/usecases/Metadata.java?rev=376269&r1=376268&r2=376269&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/metadata/usecases/Metadata.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/metadata/usecases/Metadata.java Thu Feb 9 03:51:55 2006
@@ -16,6 +16,9 @@
*/
package org.apache.lenya.cms.metadata.usecases;
+import java.util.HashMap;
+import java.util.Iterator;
+
import org.apache.lenya.cms.metadata.MetaData;
import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.site.usecases.SiteUsecase;
@@ -57,7 +60,7 @@
for (int i = 0; i < keys.length; i++) {
String value = meta.getFirstValue(keys[i]);
if (value != null) {
- setParameter(keys[i], value);
+ setParameter("meta.dc." + keys[i], value);
}
}
@@ -95,7 +98,7 @@
String[] keys = meta.getPossibleKeys();
for (int i = 0; i < keys.length; i++) {
- String value = getParameterAsString(keys[i]);
+ String value = getParameterAsString("meta.dc." + keys[i]);
if (value != null) {
meta.setValue(keys[i], value);
}
Modified: lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx?rev=376269&r1=376268&r2=376269&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/meta.jx Thu Feb 9 03:51:55 2006
@@ -36,13 +36,13 @@
<tr>
<td class="lenya-entry-caption"><label for="title"><i18n:text>Title</i18n:text>:</label></td>
<td>
- <input type="text" id="title" name="title" class="lenya-form-element" value="${usecase.getParameter('title')}"/>
+ <input type="text" id="title" name="meta.dc.title" class="lenya-form-element" value="${usecase.getParameter('meta.dc.title')}"/>
</td>
</tr>
<tr>
<td class="lenya-entry-caption"><label for="subject"><i18n:text>Subject</i18n:text>:</label></td>
<td>
- <input type="text" id="subject" name="subject" class="lenya-form-element" value="${usecase.getParameter('subject')}"/>
+ <input type="text" id="subject" name="meta.dc.subject" class="lenya-form-element" value="${usecase.getParameter('meta.dc.subject')}"/>
</td>
</tr>
<tr>
@@ -50,32 +50,32 @@
<td>
<!-- N.B.: do not put spaces or carriage returns inside the
textarea element - these would be rendered -->
- <textarea id="description" name="description" rows="3" class="lenya-form-element"><jx:out value="${usecase.getParameter('description')}"/></textarea>
+ <textarea id="description" name="meta.dc.description" rows="3" class="lenya-form-element"><jx:out value="${usecase.getParameter('meta.dc.description')}"/></textarea>
</td>
</tr>
<tr>
<td class="lenya-entry-caption"><label for="publisher"><i18n:text>Publisher</i18n:text>:</label></td>
<td>
- <input type="text" id="publisher" name="publisher" class="lenya-form-element" value="${usecase.getParameter('publisher')}"/>
+ <input type="text" id="publisher" name="meta.dc.publisher" class="lenya-form-element" value="${usecase.getParameter('meta.dc.publisher')}"/>
</td>
</tr>
<tr>
<td class="lenya-entry-caption"><label for="rights"><i18n:text>Rights</i18n:text>:</label></td>
<td>
- <input type="text" id="rights" name="rights" class="lenya-form-element" value="${usecase.getParameter('rights')}"/>
+ <input type="text" id="rights" name="meta.dc.rights" class="lenya-form-element" value="${usecase.getParameter('meta.dc.rights')}"/>
</td>
</tr>
<tr>
<td class="lenya-entry-caption"><i18n:text>Creation Date</i18n:text>:</td>
<td>
- <jx:out value="${usecase.getParameter('date')}"/>
+ <jx:out value="${usecase.getParameter('meta.dc.date')}"/>
</td>
</tr>
<tr>
<td class="lenya-entry-caption"><label for="creator"><i18n:text>Creator</i18n:text>:</label></td>
<td>
- <input type="hidden" id="creator" name="creator" class="lenya-form-element" value="${usecase.getParameter('creator')}"/>
- <jx:out value="${usecase.getParameter('creator')}"/>
+ <input type="hidden" id="creator" name="meta.dc.creator" class="lenya-form-element" value="${usecase.getParameter('meta.dc.creator')}"/>
+ <jx:out value="${usecase.getParameter('meta.dc.creator')}"/>
</td>
</tr>
<tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org