mcardle 2005/05/30 14:54:04 CEST
Modified files:
core/src/java/org/jahia/services/containers
ContainerFactory.java
Log:
updated to allow support for multiple fieldnames filtering/sorting
Revision Changes Path
1.10 +4 -3
jahia/core/src/java/org/jahia/services/containers/ContainerFactory.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/containers/ContainerFactory.java.diff?r1=1.9&r2=1.10&f=h
Index: ContainerFactory.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/containers/ContainerFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ContainerFactory.java 26 Apr 2005 08:44:49 -0000 1.9
+++ ContainerFactory.java 30 May 2005 12:54:03 -0000 1.10
@@ -61,6 +61,7 @@
import java.util.Hashtable;
import java.util.Vector;
import java.util.HashMap;
+import java.util.Arrays;
/**
@@ -714,8 +715,8 @@
sorter.setUpdateStatus();
} else {
- logger.debug ("Found sort hanlder on field [" +
- sorter.getSortingFieldName () + "]");
+ logger.debug ("Found sort hanlder on field(s) [" +
+ sorter.getSortingFieldNames () + "]");
boolean doNewSorting = true;
@@ -726,7 +727,7 @@
&& !resultHasChanged
&&
cachedSorter.getEntryLoadRequest().toString().equals(sorter.getEntryLoadRequest().toString())
&& cachedSorter.isValid ()
- && cachedSorter.getSortingFieldName ().equals
(sorter.getSortingFieldName ())
+ && Arrays.equals( cachedSorter.getSortingFieldNames (),
sorter.getSortingFieldNames () )
&& (cachedSorter.isAscOrdering () ==
sorter.isAscOrdering ())
) {
// check if containers has changed since the last time the
sorting was performed
