Author: andreas
Date: Tue Mar 25 09:46:07 2008
New Revision: 640891
URL: http://svn.apache.org/viewvc?rev=640891&view=rev
Log:
Introduce 'searchable' attribute for meta data elements.
Modified:
lenya/trunk/src/impl/java/org/apache/lenya/cms/metadata/ConfigurableElementSet.java
lenya/trunk/src/impl/java/org/apache/lenya/cms/metadata/ElementImpl.java
lenya/trunk/src/impl/test/org/apache/lenya/cms/metadata/MetaDataTest.java
lenya/trunk/src/java/org/apache/lenya/cms/metadata/Element.java
lenya/trunk/src/modules-core/metadata/config/cocoon-xconf/dc-elements.xconf
lenya/trunk/src/modules-core/metadata/config/cocoon-xconf/dc-terms.xconf
Modified: lenya/trunk/src/impl/java/org/apache/lenya/cms/metadata/ConfigurableElementSet.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/java/org/apache/lenya/cms/metadata/ConfigurableElementSet.java?rev=640891&r1=640890&r2=640891&view=diff
==============================================================================
--- lenya/trunk/src/impl/java/org/apache/lenya/cms/metadata/ConfigurableElementSet.java (original)
+++ lenya/trunk/src/impl/java/org/apache/lenya/cms/metadata/ConfigurableElementSet.java Tue Mar 25 09:46:07 2008
@@ -49,8 +49,9 @@
String name = attributeConfigs[i].getAttribute("name");
boolean isMultiple = attributeConfigs[i].getAttributeAsBoolean("multiple", false);
boolean isEditable = attributeConfigs[i].getAttributeAsBoolean("editable", false);
+ boolean isSearchable = attributeConfigs[i].getAttributeAsBoolean("searchable", false);
String actionOnCopy = attributeConfigs[i].getAttribute("onCopy", "copy");
- ElementImpl element = new ElementImpl(name, isMultiple, isEditable);
+ ElementImpl element = new ElementImpl(name, isMultiple, isEditable, isSearchable);
int action;
if (actionOnCopy.equalsIgnoreCase("copy")) {
action = Element.ONCOPY_COPY;
Modified: lenya/trunk/src/impl/java/org/apache/lenya/cms/metadata/ElementImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/java/org/apache/lenya/cms/metadata/ElementImpl.java?rev=640891&r1=640890&r2=640891&view=diff
==============================================================================
--- lenya/trunk/src/impl/java/org/apache/lenya/cms/metadata/ElementImpl.java (original)
+++ lenya/trunk/src/impl/java/org/apache/lenya/cms/metadata/ElementImpl.java Tue Mar 25 09:46:07 2008
@@ -26,17 +26,21 @@
private boolean multiple;
private String description = "";
private boolean editable;
+ private int actionOnCopy;
+ private boolean searchable;
/**
* Ctor.
* @param name The name.
* @param isMultiple if the element can have multiple values.
* @param isEditable if the element can be edited.
+ * @param isSearchable if the element is searchable.
*/
- public ElementImpl(String name, boolean isMultiple, boolean isEditable) {
+ public ElementImpl(String name, boolean isMultiple, boolean isEditable, boolean isSearchable) {
this.name = name;
this.multiple = isMultiple;
this.editable = isEditable;
+ this.searchable = isSearchable;
}
/**
@@ -44,10 +48,11 @@
* @param name The name.
* @param isMultiple if the element can have multiple values.
* @param isEditable if the element can be edited.
+ * @param isSearchable if the element is searchable.
* @param description The description of the element.
*/
- public ElementImpl(String name, boolean isMultiple, boolean isEditable, String description) {
- this(name, isMultiple, isEditable);
+ public ElementImpl(String name, boolean isMultiple, boolean isEditable, boolean isSearchable, String description) {
+ this(name, isMultiple, isEditable, isSearchable);
this.description = description;
}
@@ -67,8 +72,6 @@
return this.editable;
}
- private int actionOnCopy;
-
public int getActionOnCopy() {
return this.actionOnCopy;
}
@@ -79,6 +82,10 @@
*/
public void setActionOnCopy(int action) throws MetaDataException {
this.actionOnCopy = action;
+ }
+
+ public boolean isSearchable() {
+ return this.searchable;
}
}
Modified: lenya/trunk/src/impl/test/org/apache/lenya/cms/metadata/MetaDataTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/test/org/apache/lenya/cms/metadata/MetaDataTest.java?rev=640891&r1=640890&r2=640891&view=diff
==============================================================================
--- lenya/trunk/src/impl/test/org/apache/lenya/cms/metadata/MetaDataTest.java (original)
+++ lenya/trunk/src/impl/test/org/apache/lenya/cms/metadata/MetaDataTest.java Tue Mar 25 09:46:07 2008
@@ -151,6 +151,10 @@
return false;
}
+ public boolean isSearchable() {
+ return false;
+ }
+
}
protected class TestElementSet implements ElementSet {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/metadata/Element.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/metadata/Element.java?rev=640891&r1=640890&r2=640891&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/metadata/Element.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/metadata/Element.java Tue Mar 25 09:46:07 2008
@@ -61,5 +61,10 @@
* @return The action to be taken when meta data are copied from one owner to another.
*/
int getActionOnCopy();
+
+ /**
+ * @return If this element shall be included in search queries.
+ */
+ boolean isSearchable();
}
Modified: lenya/trunk/src/modules-core/metadata/config/cocoon-xconf/dc-elements.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/metadata/config/cocoon-xconf/dc-elements.xconf?rev=640891&r1=640890&r2=640891&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/metadata/config/cocoon-xconf/dc-elements.xconf (original)
+++ lenya/trunk/src/modules-core/metadata/config/cocoon-xconf/dc-elements.xconf Tue Mar 25 09:46:07 2008
@@ -25,10 +25,10 @@
unless="/cocoon/meta-data/component-instance[@name = 'http://purl.org/dc/elements/1.1/']">
<component-instance name="http://purl.org/dc/elements/1.1/"
class="org.apache.lenya.cms.metadata.ConfigurableElementSet">
- <element name="title" multiple="false" editable="true"/>
+ <element name="title" multiple="false" editable="true" searchable="true"/>
<element name="creator" multiple="false" editable="true"/>
- <element name="subject" multiple="false" editable="true"/>
- <element name="description" multiple="false" editable="true"/>
+ <element name="subject" multiple="false" editable="true" searchable="true"/>
+ <element name="description" multiple="false" editable="true" searchable="true"/>
<element name="publisher" multiple="false" editable="true"/>
<element name="contributor" multiple="false" editable="true"/>
<element name="date" multiple="false" editable="true"/>
Modified: lenya/trunk/src/modules-core/metadata/config/cocoon-xconf/dc-terms.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/metadata/config/cocoon-xconf/dc-terms.xconf?rev=640891&r1=640890&r2=640891&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/metadata/config/cocoon-xconf/dc-terms.xconf (original)
+++ lenya/trunk/src/modules-core/metadata/config/cocoon-xconf/dc-terms.xconf Tue Mar 25 09:46:07 2008
@@ -25,7 +25,7 @@
unless="/cocoon/meta-data/component-instance[@name = 'http://purl.org/dc/terms/']">
<component-instance name="http://purl.org/dc/terms/"
class="org.apache.lenya.cms.metadata.ConfigurableElementSet">
- <element name="abstract" multiple="false" editable="true"/>
+ <element name="abstract" multiple="false" editable="true" searchable="true"/>
<element name="accessRights" multiple="false" editable="true"/>
<element name="alternative" multiple="false" editable="true"/>
<element name="audience" multiple="false" editable="true"/>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.