Author: bpapez
Date: Fri Nov 9 14:27:05 2007
New Revision: 19104
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19104&repname=
=3Djahia
Log:
new getPageIDsWithAclIDs method
Modified:
trunk/core/src/java/org/jahia/hibernate/dao/JahiaPagesDAO.java
trunk/core/src/java/org/jahia/hibernate/manager/JahiaPagesManager.java
Modified: trunk/core/src/java/org/jahia/hibernate/dao/JahiaPagesDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/dao/JahiaPagesDAO.java&rev=3D19104&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/JahiaPagesDAO.java (origina=
l)
+++ trunk/core/src/java/org/jahia/hibernate/dao/JahiaPagesDAO.java Fri Nov =
9 14:27:05 2007
@@ -24,9 +24,11 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Set;
=
import org.apache.commons.collections.FastArrayList;
import org.apache.commons.collections.FastHashMap;
+import org.hibernate.Query;
import org.jahia.content.ContentPageKey;
import org.jahia.hibernate.model.JahiaPagesData;
import org.jahia.hibernate.model.JahiaPagesDataPK;
@@ -218,7 +220,7 @@
List retVal =3D null;
String hql =3D "select distinct pd.comp_id.id, pd.comp_id.versionI=
d,pd.comp_id.workflowState " +
"from JahiaPagesData pd where pd.parentID =3D ? " +
- "and pd.comp_id.workflowState > " + EntryLoadRequest.=
VERSIONED_WORKFLOW_STATE + " " +
+ "and pd.pageType in (0,1) and pd.comp_id.workflowStat=
e > " + EntryLoadRequest.VERSIONED_WORKFLOW_STATE + " " +
"order by pd.comp_id.id, pd.comp_id.versionId desc, p=
d.comp_id.workflowState desc";
if (pageId !=3D null) {
final HibernateTemplate template =3D getHibernateTemplate();
@@ -304,6 +306,14 @@
"where pd.pageDefinition.id=3D? and (pd.pageT=
ype=3D0 or pd.pageType=3D1)",
new Object[]{templateId});
}
+ =
+ public List getPageIDsWithAclIDs(Set aclIDs) {
+ Query query =3D this.getSession().createQuery(
+ "select distinct pd.comp_id.id from JahiaPagesData pd "
+ + "where pd.jahiaAclId in (:aclIDs) and (pd.pageType=3D0 or =
pd.pageType=3D1)");
+ query.setParameterList("aclIDs", aclIDs);
+ return query.list();
+ } =
=
public List getPageIdsInSite(Integer siteId) {
final HibernateTemplate template =3D getHibernateTemplate();
Modified: trunk/core/src/java/org/jahia/hibernate/manager/JahiaPagesManager=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/manager/JahiaPagesManager.java&rev=3D19104&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/JahiaPagesManager.java =
(original)
+++ trunk/core/src/java/org/jahia/hibernate/manager/JahiaPagesManager.java =
Fri Nov 9 14:27:05 2007
@@ -244,6 +244,10 @@
public List getPageChildIDs(int pageID) {
return getPageChildIDs(pageID, true);
}
+ =
+ public List getNonDeletedPageChildIDs(int pageID) {
+ return getPageChildIDs(pageID, false);
+ } =
=
public int getPageFieldID(int pageId) {
try {
@@ -308,6 +312,10 @@
return dao.getPageIDsWithTemplate(new Integer(templateID));
}
=
+ public List getPageIDsWithAclIDs(Set aclIDs) {
+ return dao.getPageIDsWithAclIDs(aclIDs);
+ } =
+ =
public List getPageIdsInSite(int siteID) {
return dao.getPageIdsInSite(new Integer(siteID));
}
@@ -374,8 +382,8 @@
=
public void preloadingPageInfos(Cache pageInfosCache, Cache versioning=
PageInfosCache) {
List list =3D dao.getAllPagesInfos();
- for (int i =3D 0; i < list.size(); i++) {
- JahiaPagesData data =3D (JahiaPagesData) list.get(i);
+ for (Iterator it =3D list.iterator(); it.hasNext();) { =
+ JahiaPagesData data =3D (JahiaPagesData) it.next();
JahiaPageInfo pageInfo =3D convertJahiaPagesDataToJahiaPageInf=
o(data);
List pageInfos =3D null;
if (pageInfo.getWorkflowState() < EntryLoadRequest.ACTIVE_WORK=
FLOW_STATE) {
@@ -488,8 +496,8 @@
}
=
private void convertToListOfJahiaPageInfo(List list, List pageInfos) {
- for (int i =3D 0; i < list.size(); i++) {
- JahiaPagesData data =3D (JahiaPagesData) list.get(i);
+ for (Iterator it =3D list.iterator(); it.hasNext();) { =
+ JahiaPagesData data =3D (JahiaPagesData) it.next();
if (log.isDebugEnabled()) {
log.debug("JahiaPagesData : " + data.toString());
}
@@ -499,10 +507,9 @@
}
=
private List fillChildList(List list, int pageID) {
- List retList;
- retList =3D new ArrayList(list.size());
- for (int i =3D 0; i < list.size(); i++) {
- Object[] tupe =3D (Object[]) list.get(i);
+ List retList =3D new ArrayList(list.size());
+ for (Iterator it =3D list.iterator(); it.hasNext();) { =
+ Object[] tupe =3D (Object[]) it.next();
Integer id =3D (Integer) tupe[0];
Long version =3D (Long) tupe[1];
Integer workflow =3D (Integer) tupe[2];
@@ -552,8 +559,8 @@
if (properties =3D=3D null) {
final List pageProperties =3D dao.getPageProperties(new Intege=
r(pageId));
properties =3D new FastHashMap(53);
- for (int i =3D 0; i < pageProperties.size(); i++) {
- Object[] objects =3D (Object[]) pageProperties.get(i);
+ for (Iterator it =3D pageProperties.iterator(); it.hasNext();)=
{ =
+ Object[] objects =3D (Object[]) it.next();
String name =3D (String) objects[0];
String language =3D (String) objects[1];
String value =3D (String) objects[2];
@@ -578,8 +585,8 @@
Integer oldPageId =3D (Integer) ((Object[]) pageProperties.get=
(0))[0];
List values =3D new ArrayList(11);
List languages =3D new ArrayList(11);
- for (int i =3D 0; i < pageProperties.size(); i++) {
- Object[] objects =3D (Object[]) pageProperties.get(i);
+ for (Iterator it =3D pageProperties.iterator(); it.hasNext();)=
{ =
+ Object[] objects =3D (Object[]) it.next();
String name =3D (String) objects[1];
String language =3D (String) objects[2];
String value =3D (String) objects[3];
@@ -650,8 +657,8 @@
Integer oldPageId =3D (Integer) ((Object[]) pageProperties.get=
(0))[0];
List values =3D new ArrayList(11);
List languages =3D new ArrayList(11);
- for (int i =3D 0; i < pageProperties.size(); i++) {
- Object[] objects =3D (Object[]) pageProperties.get(i);
+ for (Iterator it =3D pageProperties.iterator(); it.hasNext();)=
{ =
+ Object[] objects =3D (Object[]) it.next();
String name =3D (String) objects[1];
String language =3D (String) objects[2];
String value =3D (String) objects[3];
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
