Author: knguyen
Date: Tue Sep 11 18:15:30 2007
New Revision: 18423
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18423&repname=
=3Djahia
Log:
JAHIA-2208: fix switching between recurrence type for time based publishing.
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/timebasedp=
ublishing/TimeBasedPublishingEngine.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/timebased=
publishing/DayInWeekBean.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/time=
basedpublishing/TimeBasedPublishingEngine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/timebasedpublishing/TimeBasedPublis=
hingEngine.java&rev=3D18423&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/timebasedp=
ublishing/TimeBasedPublishingEngine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/timebasedp=
ublishing/TimeBasedPublishingEngine.java Tue Sep 11 18:15:30 2007
@@ -88,6 +88,7 @@
throws JahiaException, JahiaSessionExpirationException {
=
final HashMap subEngineMap =3D getSubEngineMap(jParams, engineMap,=
objectKey);
+ /*
final RangeRetentionRule currentRule =3D (RangeRetentionRule) subE=
ngineMap.get(ENGINE_NAME + ".currentRule");
if (currentRule !=3D null) {
try {
@@ -97,7 +98,7 @@
throw new JahiaException("Error creating rule clone","Erro=
r creating rule clone",JahiaException.ENGINE_ERROR,
JahiaException.ERROR_SEVERITY,t);
}
- }
+ }*/
engineMap.put("fieldsEditCallingEngineName", ENGINE_NAME);
=
final LockPrerequisitesResult results =3D LockPrerequisites.getIns=
tance().getLockPrerequisitesResult((LockKey) engineMap.get("LockKey"));
@@ -465,7 +466,8 @@
return true;
}
=
- private HashMap getSubEngineMap(ProcessingContext jParams, HashMap eng=
ineMap, ObjectKey objectKey) {
+ private HashMap getSubEngineMap(ProcessingContext jParams, HashMap eng=
ineMap, ObjectKey objectKey)
+ throws JahiaException {
HashMap subEngineMap =3D (HashMap) engineMap.get(SUB_ENGINE_MAP_NA=
ME);
if (subEngineMap =3D=3D null) {
subEngineMap =3D new HashMap();
@@ -480,8 +482,12 @@
rule =3D baseDef.createRule();
rule.setInherited(Boolean.TRUE);
}
-
- subEngineMap.put(ENGINE_NAME + ".currentRule", rule);
+ try {
+ subEngineMap.put(ENGINE_NAME + ".currentRule", rule.clone(=
));
+ } catch ( Throwable t ){
+ throw new JahiaException("Error cloning rule","Error cloni=
ng rule",JahiaException.APPLICATION_ERROR,
+ JahiaException.ERROR_SEVERITY,t);
+ }
oldRules.put(objectKey.toString(), rule);
subEngineMap.put(ENGINE_NAME + ".currentRuleDef", rule.getRete=
ntionRuleDef());
// todo supoort ofr other rule
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/tim=
ebasedpublishing/DayInWeekBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/timebasedpublishing/DayInWeekBean.=
java&rev=3D18423&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/timebased=
publishing/DayInWeekBean.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/timebased=
publishing/DayInWeekBean.java Tue Sep 11 18:15:30 2007
@@ -256,7 +256,7 @@
int todayDayInWeek =3D nowCalendar.get(Calendar.DAY_OF_WEEK);
int dayInWeek =3D DayInWeekBean.getJavaCalendarDayOfWeek(dayBean);
nowCal.set(Calendar.DAY_OF_WEEK,dayInWeek);
- if ( dayInWeek<=3DtodayDayInWeek ){
+ if ( dayInWeek !=3D 1 && dayInWeek<=3DtodayDayInWeek ){
nowCal.add(Calendar.WEEK_OF_MONTH,1); // add one week
}
nowCal.set(Calendar.HOUR_OF_DAY,dayBean.getFromHours());
@@ -272,7 +272,7 @@
nowCal.set(Calendar.SECOND,0);
nowCal.set(Calendar.MILLISECOND,0);
nowCal.set(Calendar.DAY_OF_WEEK,dayInWeek);
- if ( dayInWeek<=3DtodayDayInWeek ){
+ if ( dayInWeek !=3D 1 && dayInWeek<=3DtodayDayInWeek ){
nowCal.add(Calendar.WEEK_OF_MONTH,1); // add one week
}
if ( (dayBean.getFromHours() =3D=3D dayBean.getToHours() &&
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
