Author: tdraier
Date: Thu Jul 12 11:25:43 2007
New Revision: 17949
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17949&repname=
=3Djahia
Log:
call manager update intead of create/delete, optimized manager (port 17935)
Modified:
trunk/core/src/java/org/jahia/hibernate/manager/JahiaPagesManager.java
trunk/core/src/java/org/jahia/services/pages/ContentPage.java
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=3D17949&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 =
Thu Jul 12 11:25:43 2007
@@ -108,30 +108,6 @@
}
// -------------------------- OTHER METHODS --------------------------
=
- public void backupPageInfo(JahiaPageInfo activeInfo, int versionId, in=
t workflowState) {
- JahiaPagesDataPK pk =3D new JahiaPagesDataPK(new Integer(activeInf=
o.getID()),
- new Long(activeInfo.get=
VersionID()),
- new Integer(activeInfo.=
getWorkflowState()),
- activeInfo.getLanguageC=
ode());
- JahiaPagesData data =3D null;
- try {
- data =3D dao.findByPK(pk);
- } catch (ObjectRetrievalFailureException e) {
- log.error("JahiaPagesData not found or we are trying to update=
!!!!" + pk);
- }
- if (data !=3D null) {
- try {
- JahiaPagesData pagesData =3D (JahiaPagesData) data.clone();
- pagesData.getComp_id().setVersionId(new Long(versionId));
- pagesData.getComp_id().setWorkflowState(new Integer(workfl=
owState));
- dao.save(pagesData);
- } catch (CloneNotSupportedException e) {
- log.error("This object is not cloneable", e);
- }
- }
- flushCache(activeInfo.getID(),activeInfo.getJahiaID());
- }
-
private void flushCache(int pageId,int siteID) {
// WorkflowService.getInstance().flushCacheForObjectStateChange(new=
ContentPageKey(pageId));
ServicesRegistry.getInstance().getJahiaPageService().invalidatePag=
eCache(pageId);
@@ -374,14 +350,6 @@
return dao.getVersioningPageChildIDs(new Integer(pageID), new Long=
(version));
}
=
- public JahiaPageInfo loadPageInfo(int pageId, EntryStateable entryStat=
e) {
- JahiaPagesData data =3D dao.findByPK(new JahiaPagesDataPK(new Inte=
ger(pageId),
- new Long(e=
ntryState.getVersionID()),
- new Intege=
r(entryState.getWorkflowState()),
- entryState=
.getLanguageCode()));
- return convertJahiaPagesDataToJahiaPageInfo(data);
- }
-
public List loadPageInfos(int pageId, EntryLoadRequest entryLoadReques=
t) {
if (log.isDebugEnabled()) {
log.debug("Try to load page infos for page " + pageId + " with=
request " + entryLoadRequest.toString());
@@ -477,8 +445,12 @@
data.setRemoteURL(newStagingInfo.getRemoteURL());
data.setSite(siteDAO.findById(new Integer(jahiaID)));
data.setTitle(newStagingInfo.getTitle());
- dao.delete(oldData);
- dao.save(data);
+ if (pk.equals(oldPk)) {
+ dao.update(data);
+ } else {
+ dao.delete(oldData);
+ dao.save(data);
+ }
flushCache(newStagingInfo.getID(),jahiaID);
}
=
Modified: trunk/core/src/java/org/jahia/services/pages/ContentPage.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/pages/ContentPage.java&rev=3D17949&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/ContentPage.java (original)
+++ trunk/core/src/java/org/jahia/services/pages/ContentPage.java Thu Jul 1=
2 11:25:43 2007
@@ -2715,14 +2715,12 @@
if (activeInfo !=3D null) {
=
// create a versioned version of the old active en=
try
- pageManager.backupPageInfo(
+ //pageManager.
+ pageManager.updatePageInfo(
activeInfo,
activeInfo.getVersionID(),
newVersionStatus);
=
- // now we delete the active info since we are eith=
er replacing
- // it with a staging version of removing it defini=
tely
- pageManager.deletePageInfo(activeInfo);
removePageInfo(activeInfo);
mActivePageInfos.remove(activeInfo.getLanguageCode=
());
if (activeInfo.getParentID() !=3D curPageInfo.getP=
arentID()) {
@@ -2978,14 +2976,11 @@
// create a versioned version of the old active en=
try
=
// First, we create an archive entry ( newVersionS=
tatus =3D 0 , not -1 ! )
- pageManager.backupPageInfo(
+ pageManager.updatePageInfo(
activeInfo,
activeInfo.getVersionID(),
ContentObjectEntryState.WORKFLOW_STATE_VER=
SIONED);
=
- // Second, we delete the active info since we are =
either replacing
- // it with a staging version of removing it defini=
tely
- pageManager.deletePageInfo(activeInfo);
removePageInfo(activeInfo);
mActivePageInfos.remove(activeInfo.getLanguageCode=
());
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
