Author: sshyrkov
Date: Mon Jun 11 12:38:58 2007
New Revision: 17540
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17540&repname=
=3Djahia
Log:
Allow retrieving page ID for a URL key without site ID
Modified:
trunk/core/src/java/org/jahia/hibernate/dao/JahiaPagesDAO.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=3D17540&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 Mon Jun =
11 12:38:58 2007
@@ -555,14 +555,23 @@
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 });
+ List items =3D null;
+ if (siteID.intValue() > 0)
+ 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=3Ddat=
a.comp_id.id and data.site.id=3D?",
+ new Object[] { pageURLKey, siteID });
+ else
+ 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",
+ new Object[] { pageURLKey });
if (items.size() > 0)
return ((Integer) items.get(0)).intValue();
else
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
