knguyen 2004/09/01 18:34:28 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/data/containers
ContainerFilterByContainerDefinition.java
ContainerSorterBean.java
ContainerSorterByContainerDefinition.java
Log:
- sorter support for expression
- fix container filter by containr definition and language
Revision Changes Path
1.3.4.4 +2 -2
jahia/src/java/org/jahia/data/containers/ContainerFilterByContainerDefinition.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/containers/ContainerFilterByContainerDefinition.java.diff?r1=1.3.4.3&r2=1.3.4.4&f=h
1.14.4.7 +18 -0
jahia/src/java/org/jahia/data/containers/ContainerSorterBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/containers/ContainerSorterBean.java.diff?r1=1.14.4.6&r2=1.14.4.7&f=h
1.4.4.6 +20 -1
jahia/src/java/org/jahia/data/containers/ContainerSorterByContainerDefinition.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/containers/ContainerSorterByContainerDefinition.java.diff?r1=1.4.4.5&r2=1.4.4.6&f=h
Index: ContainerFilterByContainerDefinition.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/data/containers/Attic/ContainerFilterByContainerDefinition.java,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -u -r1.3.4.3 -r1.3.4.4
--- ContainerFilterByContainerDefinition.java 18 Aug 2004 13:08:32 -0000 1.3.4.3
+++ ContainerFilterByContainerDefinition.java 1 Sep 2004 16:34:27 -0000 1.3.4.4
@@ -185,7 +185,7 @@
StringBuffer buff = new StringBuffer("SELECT DISTINCT
id_jahia_ctn_entries,workflow_state FROM jahia_ctn_entries WHERE
listid_jahia_ctn_entries=");
buff.append(ctnListID);
buff.append(" AND ");
- buff.append(getMultilangAndStagingFiltering(this.entryLoadRequest));
+ buff.append(getMultilangAndStagingFiltering(this.entryLoadRequest,true));
buff.append(" ORDER BY id_jahia_ctn_entries, workflow_state");
return buff.toString();
@@ -409,7 +409,7 @@
{
StringBuffer buff = new StringBuffer("SELECT DISTINCT
id_jahia_ctn_entries,workflow_state FROM jahia_ctn_entries a, jahia_ctn_def b WHERE ");
- buff.append(getMultilangAndStagingFiltering(this.entryLoadRequest));
+ buff.append(getMultilangAndStagingFiltering(this.entryLoadRequest,true));
if ( siteId != -1 ){
buff.append(" AND ");
Index: ContainerSorterBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/data/containers/Attic/ContainerSorterBean.java,v
retrieving revision 1.14.4.6
retrieving revision 1.14.4.7
diff -u -r1.14.4.6 -r1.14.4.7
--- ContainerSorterBean.java 18 Aug 2004 13:08:32 -0000 1.14.4.6
+++ ContainerSorterBean.java 1 Sep 2004 16:34:27 -0000 1.14.4.7
@@ -44,6 +44,8 @@
import org.jahia.utils.JahiaTools;
import java.io.Serializable;
import org.jahia.services.fields.ContentField;
+import org.jahia.bin.Jahia;
+import org.jahia.data.fields.*;
/**
* Jahia Standard Containers Sort Handler for a given container list.
@@ -525,6 +527,22 @@
workflowState = EntryLoadRequest.STAGING_WORKFLOW_STATE;
}
+ if (Jahia.getThreadParamBean() != null) {
+ // expression marker
+ ExpressionMarker exprMarker =
ExpressionMarker.parseMarkerValue(fieldValue, Jahia.getThreadParamBean());
+ if ( exprMarker != null ){
+ try {
+ String value = exprMarker.getValue();
+ if ( value != null && !"".equals(value) ){
+ fieldValue = value;
+ }
+ }
+ catch (Throwable t) {
+ logger.debug("Problem while evaluating
expression " + exprMarker.getExpr(), t);
+ }
+ }
+ }
+
// resbundle marker
ResourceBundleMarker resMarker =
ResourceBundleMarker.parseMarkerValue(fieldValue);
if ( resMarker != null ){
Index: ContainerSorterByContainerDefinition.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/data/containers/Attic/ContainerSorterByContainerDefinition.java,v
retrieving revision 1.4.4.5
retrieving revision 1.4.4.6
diff -u -r1.4.4.5 -r1.4.4.6
--- ContainerSorterByContainerDefinition.java 18 Aug 2004 13:08:32 -0000 1.4.4.5
+++ ContainerSorterByContainerDefinition.java 1 Sep 2004 16:34:27 -0000 1.4.4.6
@@ -44,6 +44,8 @@
import org.jahia.utils.JahiaTools;
import java.io.Serializable;
import org.jahia.services.fields.ContentField;
+import org.jahia.bin.Jahia;
+import org.jahia.data.fields.*;
/**
* Jahia Standard Containers Sort Handler for a containers on containers
@@ -381,6 +383,22 @@
workflowState = EntryLoadRequest.STAGING_WORKFLOW_STATE;
}
+ if (Jahia.getThreadParamBean() != null) {
+ // expression marker
+ ExpressionMarker exprMarker =
ExpressionMarker.parseMarkerValue(fieldValue, Jahia.getThreadParamBean());
+ if ( exprMarker != null ){
+ try {
+ String value = exprMarker.getValue();
+ if ( value != null && !"".equals(value) ){
+ fieldValue = value;
+ }
+ }
+ catch (Throwable t) {
+ logger.debug("Problem while evaluating
expression " + exprMarker.getExpr(), t);
+ }
+ }
+ }
+
// resbundle marker
ResourceBundleMarker resMarker =
ResourceBundleMarker.parseMarkerValue(fieldValue);
if ( resMarker != null ){
@@ -394,8 +412,9 @@
}
}
+
TempField aField = new
TempField(fieldID,ctnID,0,workflowState,languageCode,fieldValue);
- String key = fieldID + "_" + workflowState;
+ String key = fieldID + "_" + workflowState + "_" +
languageCode;
maps.put(key,aField);
}
}
