Author: cmailleux
Date: Mon Jan 7 10:30:30 2008
New Revision: 19459
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19459&repname=
=3Djahia
Log:
Updated version of meditel development
Modified:
trunk/core/src/java/org/jahia/data/containers/StagedContainerFilterByCo=
ntainerDefinition.java
trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java
trunk/core/src/java/org/jahia/hibernate/manager/JahiaContainerManager.j=
ava
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=3D19459&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 Mon Jan 7 10:30:30 2008
@@ -20,6 +20,7 @@
import java.util.BitSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
=
import org.jahia.exceptions.JahiaException;
import org.jahia.hibernate.manager.JahiaContainerManager;
@@ -35,6 +36,7 @@
*/
public class StagedContainerFilterByContainerDefinition extends
ContainerFilterByContainerDefinition {
+ private Set pagesID;
=
/**
* Initializes an instance of this class.
@@ -49,6 +51,26 @@
super(containerDefinitionName, EntryLoadRequest.STAGED);
}
/**
+ * Initializes an instance of this class. That will filter for the lis=
t id found in the tag
+ *
+ * @param siteId
+ * the site ID
+ */
+ public StagedContainerFilterByContainerDefinition(int siteId) {
+ super(null,EntryLoadRequest.STAGED);
+ }
+ /**
+ * Initializes an instance of this class. That will filter for the def=
inition name in all pages passed in the Set.
+ *
+ * @param siteId the site ID
+ * @param pagesID set of Integer referrring to pages id
+ * @param containerDefinitionName the container definition to look at =
in the pages
+ */
+ public StagedContainerFilterByContainerDefinition(int siteId, Set page=
sID, String containerDefinitionName) {
+ super(containerDefinitionName,EntryLoadRequest.STAGED);
+ this.pagesID =3D pagesID;
+ }
+ /**
* The expected result is a bit set of matching container ids.
*
* @param int ctnListID, the container list id
@@ -101,10 +123,11 @@
.getContext();
JahiaContainerManager containerMgr =3D (JahiaContainerManager) con=
text
.getBean(JahiaContainerManager.class.getName());
+
List ctnIds =3D containerMgr.getContainerIds(new Integer(listId),
new Integer(siteId), siteId > 0 ? Boolean.TRUE : Boolean.F=
ALSE,
- containerDefinitionName, this.entryLoadRequest, false, tru=
e,
- true, siteId > 0 ? true : false);
+ getContainerDefinitionName(), this.entryLoadRequest, false=
, true,
+ true, siteId > 0 ? true : false,pagesID);
=
BitSet bits =3D new BitSet();
=
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=3D19459&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 Mon =
Jan 7 10:30:30 2008
@@ -609,10 +609,10 @@
return retVal;
}
=
- public List getContainerIds(Integer ctListId, Integer siteId,
- Boolean siteLevel, String containerDefinitionName,
- EntryLoadRequest loadRequest, boolean ignoreLang,
- boolean stagingOnly, boolean ascendingOrder, boolean orderByPa=
ge) {
+ public List getContainerIds(Integer ctListId, Integer siteId, Boolean =
siteLevel, String containerDefinitionName,
+ EntryLoadRequest loadRequest, boolean igno=
reLang, boolean stagingOnly, boolean ascendingOrder,
+ boolean orderByPage,
+ Set pagesID) {
=
StringBuffer buff =3D new StringBuffer(1024);
HashMap parameters =3D new HashMap();
@@ -631,7 +631,9 @@
} else if (ctListId !=3D null && ctListId.intValue() > 0) {
parameters.put("ctListId", ctListId);
}
-
+ if(pagesID !=3D null && pagesID.size()>0) {
+ parameters.put("pagesID",pagesID);
+ }
if (parameters.containsKey("siteId")) {
buff.append(" c.siteId=3D :siteId AND ");
}
@@ -641,6 +643,17 @@
if (parameters.containsKey("ctListId")) {
buff.append(" c.listid=3D :ctListId AND ");
}
+ if (parameters.containsKey("pagesID")) {
+ buff.append(" c.pageid in (");
+ Iterator it =3D pagesID.iterator();
+ for (int i =3D0;it.hasNext();i++) {
+ Integer integer =3D (Integer) it.next();
+ if(i>0) buff.append(",");
+ buff.append(integer);
+ }
+ buff.append(") AND ");
+ parameters.remove("pagesID");
+ }
appendContainerMultilangAndWorkflowParams(buff, parameters, loadRe=
quest,
ignoreLang, stagingOnly);
buff.append(" order by ");
Modified: trunk/core/src/java/org/jahia/hibernate/manager/JahiaContainerMan=
ager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/manager/JahiaContainerManager.java&rev=3D19459&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/manager/JahiaContainerManager.j=
ava (original)
+++ trunk/core/src/java/org/jahia/hibernate/manager/JahiaContainerManager.j=
ava Mon Jan 7 10:30:30 2008
@@ -1227,14 +1227,14 @@
ascendingOrder);
}
=
- public List getContainerIds(Integer ctListId, Integer siteId,
- Boolean siteLevel, String containerDefinitionName,
- EntryLoadRequest loadRequest, boolean ignoreLang,
- boolean stagingOnly, boolean ascendingOrder, boolean orderByPa=
ge) {
+ public List getContainerIds(Integer ctListId, Integer siteId, Boolean =
siteLevel, String containerDefinitionName,
+ EntryLoadRequest loadRequest, boolean igno=
reLang, boolean stagingOnly, boolean ascendingOrder,
+ boolean orderByPage,
+ Set pagesID) {
=
return dao.getContainerIds(ctListId, siteId, siteLevel,
containerDefinitionName, loadRequest, ignoreLang, stagingO=
nly,
- ascendingOrder, orderByPage);
+ ascendingOrder, orderByPage,pagesID);
} =
=
/**
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
