Author: cmailleux
Date: Fri Dec 21 18:02:17 2007
New Revision: 19405
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19405&repname=
=3Djahia
Log:
Correction for really used the StagedContainerDefinitionFIlter modified by =
benjamin and werner
Correct also some SQL issues in containerDAO
Modified:
trunk/core/src/java/org/jahia/data/containers/StagedContainerFilterByCo=
ntainerDefinition.java
trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java
Modified: trunk/core/src/java/org/jahia/data/containers/StagedContainerFilt=
erByContainerDefinition.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/containers/StagedContainerFilterByContainerDefinition.java&re=
v=3D19405&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/data/containers/StagedContainerFilterByCo=
ntainerDefinition.java (original)
+++ trunk/core/src/java/org/jahia/data/containers/StagedContainerFilterByCo=
ntainerDefinition.java Fri Dec 21 18:02:17 2007
@@ -57,7 +57,32 @@
private BitSet doFiltering(int ctnListID) throws JahiaException {
return doFilteringBySite(0, "", ctnListID);
}
- =
+
+ //--------------------------------------------------------------------=
------
+ /**
+ * Perform filtering on a given site or all sites
+ *
+ * The expected result is a bit set of matching container ids.
+ *
+ * If siteId =3D -1 , returns results from all sites
+ *
+ * If the containerDefinitionName is null, return result from all cont=
ainers
+ * no regards to it definition !
+ *
+ * @param siteId
+ * @param containerDefinitionName
+ * @return BitSet bits, the expected result as a bit set of matching c=
tn ids,each bit position set to true correspond to matching ctn ids.
+ * @throws JahiaException
+ */
+ public BitSet doFilterBySite(int siteId, String containerDefinitionNam=
e, int listId)
+ throws JahiaException
+ {
+
+ BitSet result =3D null;
+ result =3D doFilteringBySite(siteId, containerDefinitionName, list=
Id);
+ return result;
+ }
+
/**
*
* The expected result is a bit set of matching container ids for a giv=
en siteId.
Modified: trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/dao/JahiaContainerDAO.java&rev=3D19405&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java (ori=
ginal)
+++ trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java Fri =
Dec 21 18:02:17 2007
@@ -616,7 +616,7 @@
=
StringBuffer buff =3D new StringBuffer(1024);
HashMap parameters =3D new HashMap();
- buff.append(" select distinct c.comp_id.id, c.comp_id.workflowStat=
e, c.comp_id.versionId, c.jahiaAclId from JahiaContainer c ");
+ buff.append(" select distinct c.comp_id.id, c.comp_id.workflowStat=
e, c.comp_id.versionId, c.jahiaAclId, c.pageid from JahiaContainer c ");
if (!ignoreLang) {
buff.append(", JahiaFieldsData f ");
}
@@ -645,7 +645,7 @@
ignoreLang, stagingOnly);
buff.append(" order by ");
if (orderByPage) {
- buff.append(" c.pageId,");
+ buff.append(" c.pageid,");
}
buff.append("c.comp_id.id");
if (!ascendingOrder) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
