Author: sshyrkov
Date: Fri Jun 1 09:55:50 2007
New Revision: 17427
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17427&repname=
=3Djahia
Log:
CONE-29: Added new method for retrieving page ID based on the page URL key =
and site ID
Modified:
trunk/core/src/java/org/jahia/hibernate/dao/JahiaPagesDAO.java
trunk/core/src/java/org/jahia/hibernate/manager/JahiaPagesManager.java
trunk/core/src/java/org/jahia/services/pages/JahiaPageBaseService.java
trunk/core/src/java/org/jahia/services/pages/JahiaPageService.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=3D17427&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 Jun =
1 09:55:50 2007
@@ -19,6 +19,12 @@
*/
package org.jahia.hibernate.dao;
=
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
import org.apache.commons.collections.FastArrayList;
import org.apache.commons.collections.FastHashMap;
import org.jahia.content.ContentPageKey;
@@ -26,12 +32,11 @@
import org.jahia.hibernate.model.JahiaPagesDataPK;
import org.jahia.hibernate.model.JahiaPagesProp;
import org.jahia.hibernate.model.JahiaPagesPropPK;
-import org.jahia.services.version.EntryLoadRequest;
import org.jahia.services.pages.ContentPage;
+import org.jahia.services.pages.PageProperty;
+import org.jahia.services.version.EntryLoadRequest;
import org.springframework.orm.hibernate3.HibernateTemplate;
=
-import java.util.*;
-
/**
* Created by IntelliJ IDEA.
* User: Rincevent
@@ -536,5 +541,31 @@
"from JahiaPagesProp p, JahiaPagesData data "=
+
"where p.value=3D? and p.comp_id.pageId=3Ddat=
a.comp_id.id and data.site.id=3D?",new Object[]{propertyValue,siteID});
}
-}
=
+ /**
+ * Returns the page ID with the specified URL key value for the given
sit=
e.
+ * =
+ * @param pageURLKey
+ * the page URL key value to search for
+ * @param siteID
+ * the target site ID
+ * @return the page ID with the specified URL key value for the given
site
+ */
+ public int getPageIDByURLKeyAndSiteID(String pageURLKey, Integer
siteID) {
+ final HibernateTemplate template =3D getHibernateTemplate();
+ template.setCacheQueries(true);
+ template.setFlushMode(HibernateTemplate.FLUSH_NEVER);
+ List items =3D template
+ .find(
+ "select p.comp_id.pageId "
+ + "from
JahiaPagesProp p, JahiaPagesData data "
+ + "where
p.comp_id.name=3D'"
+ +
PageProperty.PAGE_URL_KEY_PROPNAME
+ + "' and
p.value=3D? and p.comp_id.pageId=3Ddata.comp_id.id and da=
ta.site.id=3D?",
+ new Object[] { pageURLKey,
siteID });
+ if (items.size() > 0)
+ return ((Integer) items.get(0)).intValue();
+ else
+ return 0;
+ }
+}
\ No newline at end of file
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=3D17427&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 Jun 1 09:55:50 2007
@@ -714,5 +714,18 @@
}
return properties;
}
+
+ /**
+ * Returns the page ID with the specified URL key value for the given
sit=
e.
+ * =
+ * @param pageURLKey
+ * the page URL key value to search for
+ * @param siteID
+ * the target site ID
+ * @return the page ID with the specified URL key value for the given
site
+ */
+ public int getPageIDByURLKeyAndSiteID(String pageURLKey, int siteID) {
+ return dao.getPageIDByURLKeyAndSiteID(pageURLKey, new
Integer(siteID));
+ }
}
=
Modified: trunk/core/src/java/org/jahia/services/pages/JahiaPageBaseService=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/pages/JahiaPageBaseService.java&rev=3D17427&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/services/pages/JahiaPageBaseService.java =
(original)
+++ trunk/core/src/java/org/jahia/services/pages/JahiaPageBaseService.java =
Fri Jun 1 09:55:50 2007
@@ -2292,4 +2292,8 @@
=
} =
=
+ public int getPageIDByURLKeyAndSiteID(String pageURLKey, int siteID) {
+ return pageManager.getPageIDByURLKeyAndSiteID(pageURLKey,
siteID);
+ }
+ =
}
Modified: trunk/core/src/java/org/jahia/services/pages/JahiaPageService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/pages/JahiaPageService.java&rev=3D17427&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/services/pages/JahiaPageService.java (ori=
ginal)
+++ trunk/core/src/java/org/jahia/services/pages/JahiaPageService.java Fri =
Jun 1 09:55:50 2007
@@ -173,6 +173,7 @@
public abstract List getPageIDsInSite (int siteID, int linkType)
throws JahiaException;
=
+
//--------------------------------------------------------------------=
------
/**
* Retrieves all the page IDs that use the specified template
@@ -814,4 +815,15 @@
public abstract List getPagePropertiesByValueAndSiteID(String pageURLK=
ey, int siteID) throws JahiaException;
=
public abstract int getParentPageFieldId(int pageId,EntryLoadRequest l=
oadRequest);
+
+ /**
+ * Returns the page ID with the specified URL key value for the given
sit=
e.
+ * =
+ * @param pageURLKey
+ * the page URL key value to search for
+ * @param siteID
+ * the target site ID
+ * @return the page ID with the specified URL key value for the given
site
+ */
+ public abstract int getPageIDByURLKeyAndSiteID(String pageURLKey, int
sit=
eID);
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
