mcardle 2005/05/30 14:54:16 CEST
Modified files:
core/src/java/org/jahia/data/containers
ContainerMetadataSorterBean.java
Log:
updated to allow support for multiple fieldnames filtering/sorting
Revision Changes Path
1.3 +6 -5
jahia/core/src/java/org/jahia/data/containers/ContainerMetadataSorterBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/data/containers/ContainerMetadataSorterBean.java.diff?r1=1.2&r2=1.3&f=h
Index: ContainerMetadataSorterBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/data/containers/ContainerMetadataSorterBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContainerMetadataSorterBean.java 28 Apr 2005 14:57:36 -0000 1.2
+++ ContainerMetadataSorterBean.java 30 May 2005 12:54:16 -0000 1.3
@@ -125,14 +125,14 @@
* @throws JahiaException
*/
/**
- *
+ *
* @param ctnListID
* @param fieldName
* @param numberSort
* @param jParams
* @param entryLoadRequest
* @throws JahiaException
- */
+ */
public ContainerMetadataSorterBean(int ctnListID, String fieldName,
boolean numberSort,
String numberFormat,
@@ -231,7 +231,7 @@
*/
public ContainerMetadataSorterBean(String containerListName,
ParamBean jParams,
- String fieldName, boolean numberSort,
+ String fieldName, boolean numberSort,
String numberFormat,
EntryLoadRequest entryLoadRequest)
throws JahiaException
@@ -367,8 +367,9 @@
}
}
if (checkMetadata) {
- jahiaObject = contentContainer.getMetadata(this.
- getSortingFieldName());
+ //MC: because ContainerMetadataSorterBean extends
ContainerSorterBean, it only supports filtering on
+ //one field, as opposed to
ContainerSorterByContainerDefinition. So we only retrieve the first field:
+ jahiaObject =
contentContainer.getMetadata(this.getSortingFieldNames()[0]);
if (jahiaObject != null) {
fieldId =
Integer.parseInt(jahiaObject.getObjectKey().
getIDInType());
