Author: michiel
Date: 2010-06-21 11:35:40 +0200 (Mon, 21 Jun 2010)
New Revision: 42619
Modified:
mmbase/trunk/contributions/calendar/src/main/config/functions/calendar.xml
mmbase/trunk/contributions/calendar/src/main/java/org/mmbase/calendar/ItemsController.java
mmbase/trunk/contributions/calendar/src/test/java/org/mmbase/calendar/ItemsControllerTest.java
Log:
making gaps didn't work yet
Modified:
mmbase/trunk/contributions/calendar/src/main/config/functions/calendar.xml
===================================================================
--- mmbase/trunk/contributions/calendar/src/main/config/functions/calendar.xml
2010-06-21 08:47:25 UTC (rev 42618)
+++ mmbase/trunk/contributions/calendar/src/main/config/functions/calendar.xml
2010-06-21 09:35:40 UTC (rev 42619)
@@ -5,8 +5,8 @@
<description></description>
<function name="itemsController">
- <type>class</type>
- <class>org.mmbase.security.calendar.ItemsController</class>
+ <type>bean</type>
+ <class>org.mmbase.calendar.ItemsController</class>
<method>post</method>
</function>
Modified:
mmbase/trunk/contributions/calendar/src/main/java/org/mmbase/calendar/ItemsController.java
===================================================================
---
mmbase/trunk/contributions/calendar/src/main/java/org/mmbase/calendar/ItemsController.java
2010-06-21 08:47:25 UTC (rev 42618)
+++
mmbase/trunk/contributions/calendar/src/main/java/org/mmbase/calendar/ItemsController.java
2010-06-21 09:35:40 UTC (rev 42619)
@@ -11,7 +11,9 @@
import java.util.*;
import org.mmbase.bridge.*;
+import org.mmbase.bridge.util.*;
import org.mmbase.storage.search.*;
+import org.mmbase.storage.search.implementation.*;
import org.mmbase.util.functions.Required;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -28,7 +30,10 @@
private static final Logger LOG =
Logging.getLoggerInstance(ItemsController.class);
private NodeQuery query;
+ private NodeQuery abstractQuery;
private boolean desiredValue;
+ private Date startForm;
+ private Date stopForm;
private Date start;
private Date stop;
private String title;
@@ -50,20 +55,34 @@
@Required
public void setQuery(NodeQuery query) {
this.query = query;
+ abstractQuery = (NodeQuery) query.clone();
+ Queries.removeConstraint(abstractQuery, getDate(abstractQuery,
abstractQuery.getConstraint(), "start"));
+ Queries.removeConstraint(abstractQuery, getDate(abstractQuery,
abstractQuery.getConstraint(), "stop"));
+ abstractQuery.setMaxNumber(Integer.MAX_VALUE);
}
+ public void setStartForm(Date start) {
+ this.startForm = start;
+ }
+
+
+ public void setStopForm(Date stop) {
+ this.stopForm = stop;
+ }
+
+ @Required
public void setStart(Date start) {
this.start = start;
}
-
+ @Required
public void setStop(Date stop) {
this.stop = stop;
}
- protected static FieldValueConstraint getDate(NodeQuery q, Constraint
constraint, String field) {
- if (constraint instanceof FieldValueConstraint) {
- FieldValueConstraint fvc = (FieldValueConstraint) constraint;
+ protected static BasicFieldValueConstraint getDate(NodeQuery q, Constraint
constraint, String field) {
+ if (constraint instanceof BasicFieldValueConstraint) {
+ BasicFieldValueConstraint fvc = (BasicFieldValueConstraint)
constraint;
if (fvc.getField().getStep().equals(q.getNodeStep()) &&
fvc.getField().getFieldName().equals(field)) {
return fvc;
} else {
@@ -72,7 +91,7 @@
} else if (constraint instanceof CompositeConstraint) {
CompositeConstraint composite = (CompositeConstraint) constraint;
for (Constraint cons : composite.getChilds()) {
- FieldValueConstraint res = getDate(q, cons, field);
+ BasicFieldValueConstraint res = getDate(q, cons, field);
if (res != null) {
return res;
}
@@ -94,80 +113,119 @@
protected List<Node> getRelevantPeriods() {
List<Node> result = new ArrayList<Node>();
- if (start == null) {
- start = getDate(query, "start");
+ if (startForm == null) {
+ // TODO should match one item before given item
+ LOG.debug("No start given");
+ startForm = start;
}
- if (stop == null) {
- stop = getDate(query, "stop");
+ if (stopForm == null) {
+ LOG.debug("No stop given");
+ // TODO should match one item after given item
+ stopForm = stop;
}
- NodeQuery clone = (NodeQuery) query.clone();
+ result.addAll(abstractQuery.getNodeManager().getList(abstractQuery));
return result;
}
+ protected Node createNode() {
+ Cloud cloud = query.getCloud();
+ Node newNode = cloud.getNodeManager("calendar_items").createNode();
+ // TODO this supposes that the node belongs to the last step always
+ Queries.applyConstraints(abstractQuery,
abstractQuery.getSteps().get(query.getSteps().size() - 1), newNode);
+ newNode.setStringValue("title", title);
+ return newNode;
+ }
+
protected int addAndDelete(List<Node> periods) {
- Date startDate = getDate(query, "start");
- Date endDate = getDate(query, "stop");
+ if (desiredValue) {
+ LOG.debug("including " + " " + start + " " + stop);
+ } else {
+ LOG.debug("execluding " + " " + start + " " + stop);
+ }
for (int i = 0 ; i < periods.size(); i++) {
Node period = periods.get(i);
if (desiredValue) {
- if (period.getDateValue("start").getTime() <=
startDate.getTime()) {
- if (period.getDateValue("stop").getTime() >=
endDate.getTime()) {
- // already covered by a (longer) period
+ LOG.debug("include period " + period.getDateValue("start") +
"-" + period.getDateValue("stop") + " " + start + " " + stop);
+ if (period.getDateValue("start").getTime() <= start.getTime())
{
+ if (period.getDateValue("stop").getTime() >=
stop.getTime()) {
+ LOG.debug("already covered by a (longer) period");
return 0;
- } else if (period.getDateValue("stop").getTime() >=
startDate.getTime()) {
- // partially covered by a period that can be extended
- period.setDateValue("stop", endDate);
+ } else if (period.getDateValue("stop").getTime() >=
start.getTime()) {
+ LOG.debug("partially covered by a period that can be
extended");
+ period.setDateValue("stop", stop);
+ period.commit();
return 1;
} else {
- // period does not border or overlap
+ LOG.debug("period does not border or overlap");
continue;
}
} else {
- if (period.getDateValue("start").getTime() <=
endDate.getTime()) {
- if (period.getDateValue("stop").getTime() <=
endDate.getTime()) {
- // period is completely included by desired
period, extend on both sides.
- period.setDateValue("stop", endDate);
- period.setDateValue("start", startDate);
+ if (period.getDateValue("start").getTime() <=
stop.getTime()) {
+ if (period.getDateValue("stop").getTime() <=
stop.getTime()) {
+ LOG.debug("period is completely included by
desired period, extend on both sides.");
+ period.setDateValue("stop", stop);
+ period.setDateValue("start", start);
+ period.commit();
} else {
- // desired perios is at the beginning of an
existing item, extend at beginning
- period.setDateValue("start", startDate);
+ LOG.debug("desired period is at the beginning of
an existing item, extend at beginning");
+ period.setDateValue("start", start);
+ period.commit();
}
return 1;
}
}
} else {
- if (period.getDateValue("start").getTime() <=
startDate.getTime()) {
- if (period.getDateValue("stop").getTime() >
startDate.getTime()) {
- if (period.getDateValue("stop").getTime() <=
endDate.getTime()) {
- // covered at the end of (longer) period
- if (period.getDateValue("start").getTime() ==
startDate.getTime()) {
+ LOG.debug("exclude period " + period.getDateValue("start") +
"-" + period.getDateValue("stop") + " " + start + " " + stop);
+ if (period.getDateValue("start").getTime() <= start.getTime())
{
+ if (period.getDateValue("stop").getTime() >
start.getTime()) {
+ if (period.getDateValue("stop").getTime() <=
stop.getTime()) {
+ LOG.debug("covered at the end of (longer) period");
+ if (period.getDateValue("start").getTime() ==
start.getTime()) {
periods.remove(i);
period.delete(true);
return 1;
} else {
- period.setDateValue("stop", startDate);
+ period.setDateValue("stop", start);
+ period.commit();
return 1;
}
- } else if (period.getDateValue("start").getTime() ==
startDate.getTime()) {
- // convered at the begin of a longer period
- period.setDateValue("start", endDate);
+ } else if (period.getDateValue("start").getTime() ==
start.getTime()) {
+ LOG.debug("covered at the begin of a longer
period");
+ period.setDateValue("start", stop);
+ period.commit();
return 1;
+ } else {
+ LOG.debug("covered by a longer period");
+ Date originalStop = period.getDateValue("stop");
+ period.setDateValue("stop", start);
+ period.commit();
+ Node newNode = createNode();
+ newNode.setDateValue("start", stop);
+ newNode.setDateValue("stop", originalStop);
+ newNode.commit();
+ if (query.getSteps().size() > 1) {
+ Queries.addToResult(query, newNode);
+ }
+ periods.add(newNode);
+ return 2;
}
}
+ } else {
}
}
}
if (desiredValue) {
- // no matching period found, so create one
- Cloud cloud = query.getCloud();
- Node newNode = cloud.getNodeManager("calendar_items").createNode();
- newNode.setStringValue("title", title);
- newNode.setDateValue("start", startDate);
- newNode.setDateValue("stop", endDate);
+ LOG.debug("no matching period found, so creating one");
+ Node newNode = createNode();
+ newNode.setDateValue("start", start);
+ newNode.setDateValue("stop", stop);
newNode.commit();
+ if (query.getSteps().size() > 1) {
+ Queries.addToResult(query, newNode);
+ }
periods.add(newNode);
return 1;
} else {
@@ -200,6 +258,7 @@
public int post() {
int changes = 0;
List<Node> periods = getRelevantPeriods();
+ LOG.service("Found " + startForm + "-" + stopForm + ": " + periods);
changes += fix(periods);
return changes;
}
Modified:
mmbase/trunk/contributions/calendar/src/test/java/org/mmbase/calendar/ItemsControllerTest.java
===================================================================
---
mmbase/trunk/contributions/calendar/src/test/java/org/mmbase/calendar/ItemsControllerTest.java
2010-06-21 08:47:25 UTC (rev 42618)
+++
mmbase/trunk/contributions/calendar/src/test/java/org/mmbase/calendar/ItemsControllerTest.java
2010-06-21 09:35:40 UTC (rev 42619)
@@ -28,7 +28,6 @@
private static ItemsController controller = new ItemsController();
private static NodeManager items;
- private static List<Node> periods = new ArrayList<Node>();
public CloudContext getCloudContext() {
@@ -42,25 +41,49 @@
MockCloudContext.getInstance().addNodeManagers(MockBuilderReader.getBuilderLoader().getChildResourceLoader("calendar"));
Cloud cloud = MockCloudContext.getInstance().getCloud("mmbase");
items = cloud.getNodeManager("calendar_items");
+ controller.setTitle("foo bar");
}
protected NodeQuery getQuery(NodeManager items, String start, String end) {
NodeQuery query = items.createQuery();
Queries.addConstraint(query,
- Queries.createConstraint(query, "start",
Queries.getOperator("<"), DynamicDate.eval(start)));
+ Queries.createConstraint(query, "start",
Queries.getOperator("<="), DynamicDate.eval(start)));
Queries.addConstraint(query,
- Queries.createConstraint(query, "stop",
Queries.getOperator(">"), DynamicDate.eval(end)));
+ Queries.createConstraint(query, "stop",
Queries.getOperator(">="), DynamicDate.eval(end)));
return query;
}
+ protected void setStartStop(String start, String end) {
+ controller.setQuery(getQuery(items, start, end));
+ controller.setStart(DynamicDate.eval(start));
+ controller.setStop(DynamicDate.eval(end));
+ }
+ protected void setStartStop(String start, String end, String startForm,
String stopForm) {
+ setStartStop(start, end);
+ controller.setStartForm(DynamicDate.eval(startForm));
+ controller.setStopForm(DynamicDate.eval(stopForm));
+ }
- @Test
+ protected List<Node> getPeriods(String[]... p) {
+ List<Node> periods = new ArrayList<Node>();
+ for (String[] startAndStop : p) {
+ Node periodNode = items.createNode();
+ periodNode.setDateValue("start",
DynamicDate.eval(startAndStop[0]));
+ periodNode.setDateValue("stop", DynamicDate.eval(startAndStop[1]));
+ periodNode.commit();
+ periods.add(periodNode);
+ }
+ return periods;
+ }
+
+
+ //@Test
public void addToEmpty() throws Exception {
assertNotNull(items);
- controller.setQuery(getQuery(items, "today", "today + 1 day"));
- controller.setTitle("foo bar");
+ setStartStop("today", "today + 1 day");
controller.setValue(true);
+ List<Node> periods = getPeriods();
assertEquals(1, controller.fix(periods));
assertEquals(1, periods.size());
@@ -70,20 +93,25 @@
assertEquals(1, periods.size());
}
- @Test
+ //@Test
public void addToPeriod() throws Exception {
// Add one day more
- controller.setQuery(getQuery(items, "today + 1 day", "today + 2 day"));
+ setStartStop("today + 1 day", "today + 2 day");
+ controller.setValue(true);
+ List<Node> periods = getPeriods(new String[] {"today", "today + 1
day"});
assertEquals(1, controller.fix(periods));
assertEquals(1, periods.size());
assertEquals(DynamicDate.eval("today"),
periods.get(0).getDateValue("start"));
assertEquals(DynamicDate.eval("today + 2 day"),
periods.get(0).getDateValue("stop"));
}
- @Test
+ //@Test
public void addWithGap() throws Exception {
// Yet another day, but leave a gap
- controller.setQuery(getQuery(items, "today + 3 day", "today + 4 day"));
+ setStartStop("today + 3 day", "today + 4 day");
+ controller.setValue(true);
+ List<Node> periods = getPeriods(new String[] {"today", "today + 2
day"});
+
assertEquals(1, controller.fix(periods));
assertEquals(2, periods.size());
assertEquals(DynamicDate.eval("today"),
periods.get(0).getDateValue("start"));
@@ -96,11 +124,16 @@
}
- @Test
+ //@Test
public void removeAtBeginning() throws Exception {
// remove first day again
- controller.setQuery(getQuery(items, "today", "today + 1 day"));
+ setStartStop("today", "today + 1 day", "toyear", "toyear + 1 year");
controller.setValue(false);
+ List<Node> periods = getPeriods(new String[] {"today", "today + 2
day"},
+ new String[] {"today + 3 day", "today
+ 4 day"}
+ );
+
+
assertEquals(1, controller.fix(periods));
assertEquals(2, periods.size());
assertEquals(DynamicDate.eval("today + 1 day"),
periods.get(0).getDateValue("start"));
@@ -111,10 +144,14 @@
assertEquals(2, periods.size());
}
- @Test
+ //@Test
public void insertAtGap() throws Exception {
- controller.setQuery(getQuery(items, "today + 2 day", "today + 3 day"));
+ setStartStop("today + 2 day", "today + 3 day");
controller.setValue(true);
+ List<Node> periods = getPeriods(new String[] {"today + 1 day", "today
+ 2 day"},
+ new String[] {"today + 3 day", "today
+ 4 day"}
+ );
+
assertEquals(2, controller.fix(periods));
assertEquals(1, periods.size());
@@ -124,4 +161,26 @@
assertEquals(0, controller.fix(periods));
assertEquals(1, periods.size());
}
+
+ //@Test
+ public void remove() throws Exception {
+ List<Node> periods = getPeriods(new String[] {"today + 1 day", "today
+ 4 day"});
+ setStartStop("today + 1 day", "today + 4 day");
+ controller.setValue(false);
+ assertEquals(1, controller.fix(periods));
+ assertEquals(0, periods.size());
+ assertEquals(0, controller.fix(periods));
+ assertEquals(0, periods.size());
+ }
+ @Test
+ public void makeGap() throws Exception {
+ List<Node> periods = getPeriods(new String[] {"today + 1 day", "today
+ 4 day"});
+ setStartStop("today + 2 day", "today + 3 day");
+ controller.setValue(false);
+ assertEquals(2, controller.fix(periods));
+ assertEquals(2, periods.size());
+ assertEquals(0, controller.fix(periods));
+ assertEquals(2, periods.size());
+
+ }
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
