Changeset 366

Timestamp:

04/12/06 12:03:31

Author:

douglm

Message:

More free/busy changes

Files:

• trunk/calendar3/appcommon/src/org/bedework/appcommon/TimeView.java (modified) (7 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwDateTime.java (modified) (2 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwFreeBusy.java (modified) (3 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/CalFacadeUtil.java (modified) (2 diffs)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/calquery/FreeBusyQuery.java (modified) (1 diff)
• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (6 diffs)
• trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java (modified) (3 diffs)
• trunk/calendar3/webclient/src/org/bedework/webclient/BwFreeBusyAction.java (modified) (4 diffs)

trunk/calendar3/appcommon/src/org/bedework/appcommon/TimeView.java

@@ -107 +107 @@
-   */
-  private TimeViewDailyInfo[] tvdis;
-
+
-  //private static final TimezoneCache tzcache = new TimezoneCache(false);
-
@@ -162 +162 @@
-    return cal.getTimezones();
-  }
-
+
-  /**
-   * @return CalSvcI
@@ -278 +278 @@
-   */
-  public Collection getDaysEvents(MyCalendarVO date) throws Throwable {
-    ArrayList al = new ArrayList();
-    CalTimezones tzcache = cal.getTimezones();
-//    Dur oneDay = new Dur(1, 0, 0, 0);
-    long millis = System.currentTimeMillis();
-    
-    //tzcache.setSysTimezones(cal.getTimezones());
-    BwDateTime startDt = CalFacadeUtil.getDateTime(date.getDateDigits(),
-                                                   tzcache);
-
-    BwDateTime endDt = startDt.getNextDay(tzcache);
-    String start = startDt.getDate();
-    String end = endDt.getDate();
-    
-    if (debug) {
-      debugMsg("Did UTC stuff in " + (System.currentTimeMillis() - millis));
-    }
-
-    //if (debug) {
-    //  debugMsg("Get days events in range " + start + " to " + end);
@@ -307 +291 @@
-    }
-
+    ArrayList al = new ArrayList();
+//  Dur oneDay = new Dur(1, 0, 0, 0);
+    long millis = System.currentTimeMillis();
+
+    //tzcache.setSysTimezones(cal.getTimezones());
+    BwDateTime startDt = CalFacadeUtil.getDateTime(date.getDateDigits(),
+                                                   tzcache);
+
+    BwDateTime endDt = startDt.getNextDay(tzcache);
+    String start = startDt.getDate();
+    String end = endDt.getDate();
+
+    if (debug) {
+      debugMsg("Did UTC stuff in " + (System.currentTimeMillis() - millis));
+    }
+
-    Iterator it = events.iterator();
-    while (it.hasNext()) {
@@ -319 +319 @@
-         2.    ((evStart >= :start) and (evStart < :end)) or
-         3.    ((evEnd > :start) and (evEnd <= :end)))
-
+
-         XXX followed caldav which might be wrong. Try
-         3.    ((evEnd > :start) and (evEnd < :end)))
@@ -440 +440 @@
-      gtpi.multi = !gtpi.last.isSameDate(gtpi.first);
-      gtpi.currentDay = new MyCalendarVO(gtpi.first.getTime(),
-         
+    
-      gtpi.year = String.valueOf(gtpi.currentDay.getYear());
-
-      Locale loc = Locale.getDefault(); // XXX Locale
-      gtpi.todaysMonth = new MyCalendarVO(   // XXX Expensive??
- 
+
-                                          loc).getTwoDigitMonth();
-
@@ -451 +451 @@
-        debugMsg("getFirstDayOfWeek() = " + getFirstDayOfWeek());
-        debugMsg("gtpi.first.getFirstDayOfWeek() = " +
-               
+    
-      }
-

trunk/calendar3/calFacade/src/org/bedework/calfacade/BwDateTime.java

@@ -97 +97 @@
-   * complications to dates, the end date is specified as non-inclusive
-   * but there are a number of boundary problems to watch out for.
- 
+
-   * <p>For date only values this field has a zero time appended so that simple
-   * string comparisons will work.
@@ -206 +206 @@
-  }
-
+  public BwDateTime copy(CalTimezones timezones) throws CalFacadeException {
+    return makeDateTime(makeDtEnd(), timezones);
+  }
+
-  /** Make a DtStart from this object
-   *

trunk/calendar3/calFacade/src/org/bedework/calfacade/BwFreeBusy.java

@@ -55 +55 @@
-
-import java.io.Serializable;
+import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Vector;
-
-/** Class representing free busy time. Used in icalendar objects
@@ -74 +74 @@
-  /** Collection of FreeBusyComponentVO
-   */
-Vector
+Collection
-
-  /** Constructor
@@ -139 +139 @@
-  /** Get the free busy times
-   *
-FreeBusyComponentVO
+BwFreeBusyComponent
-   */
-  public Collection getTimes() {
-    if (times == null) {
-Vector
+ArrayList
-    }
-    return times;

trunk/calendar3/calFacade/src/org/bedework/calfacade/CalFacadeUtil.java

@@ -55 +55 @@
-
-import org.bedework.calfacade.ifs.CalTimezones;
+import org.bedework.calfacade.svc.EventInfo;
-
-import net.fortuna.ical4j.model.Parameter;
@@ -607 +608 @@
-    return tzid;
-  }
+
+  /** This class defines the events and the period of interest and can be passed
+   * repeatedly to getPeriodsEvents.
+   *
+   * <p>The end datetime will be updated ready for the next call. If endDt is
+   * non-null on entry it will be used to set the startDt.
+   */
+  public static class GetPeriodsPars {
+    /** Event Info objects to extract from */
+    public Collection events;
+    /* Start of period - updated at each call from endDt */
+    public BwDateTime startDt;
+    /** Duration of period */
+    public BwDuration dur;
+    /** */
+    public CalTimezones tzcache;
+
+    /** On return has the end date of the period. */
+    public BwDateTime endDt;
+  }
+
+  /** Select the events in the collection which fall within the period
+   * defined by the start and duration.
+   *
+   * @param   pars      GetPeriodsPars object
+   * @return  Collection of EventInfo being one days events or empty for no events.
+   * @throws Throwable
+   */
+  public static Collection getPeriodsEvents(GetPeriodsPars pars) throws CalFacadeException {
+    ArrayList al = new ArrayList();
+    //long millis = System.currentTimeMillis();
+
+    if (pars.endDt != null) {
+      pars.startDt = pars.endDt.copy(pars.tzcache);
+    }
+    pars.endDt = pars.startDt.addDuration(pars.dur, pars.tzcache);
+    String start = pars.startDt.getDate();
+    String end = pars.endDt.getDate();
+
+    //if (debug) {
+    //  debugMsg("Did UTC stuff in " + (System.currentTimeMillis() - millis));
+    //}
+
+    Iterator it = pars.events.iterator();
+    while (it.hasNext()) {
+      EventInfo ei = (EventInfo)it.next();
+      BwEvent ev = ei.getEvent();
+
+      String evStart = ev.getDtstart().getDate();
+      String evEnd = ev.getDtend().getDate();
+
+      /* Event is within range if:
+         1.   (((evStart <= :start) and (evEnd > :start)) or
+         2.    ((evStart >= :start) and (evStart < :end)) or
+         3.    ((evEnd > :start) and (evEnd <= :end)))
+
+         XXX followed caldav which might be wrong. Try
+         3.    ((evEnd > :start) and (evEnd < :end)))
+      */
+
+      int evstSt = evStart.compareTo(start);
+      int evendSt = evEnd.compareTo(start);
+
+      //debugMsg("                   event " + evStart + " to " + evEnd);
+
+      if (((evstSt <= 0) && (evendSt > 0)) ||
+          ((evstSt >= 0) && (evStart.compareTo(end) < 0)) ||
+          //((evendSt > 0) && (evEnd.compareTo(end) <= 0))) {
+          ((evendSt > 0) && (evEnd.compareTo(end) < 0))) {
+        // Passed the tests.
+        /*
+        if (debug) {
+          debugMsg("Event passed range " + start + "-" + end +
+                   " with dates " + evStart + "-" + evEnd +
+                   ": " + ev.getSummary());
+        }*/
+        al.add(ei);
+      }
+    }
+
+    return al;
+  }
-}
-

trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/calquery/FreeBusyQuery.java

@@ -147 +147 @@
-      try {
-        BwFreeBusy fb = svci.getFreeBusy(null, new BwUser(user),
-
+, null
-
-        if (debug) {

trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java

@@ -56 +56 @@
-
-import org.bedework.calenv.CalEnv;
+import org.bedework.calfacade.CalFacadeUtil.GetPeriodsPars;
-import org.bedework.calfacade.base.BwOwnedDbentity;
-import org.bedework.calfacade.base.BwShareableDbentity;
@@ -62 +63 @@
-import org.bedework.calfacade.BwCategory;
-import org.bedework.calfacade.BwDateTime;
+import org.bedework.calfacade.BwDuration;
-import org.bedework.calfacade.BwEvent;
-import org.bedework.calfacade.BwEventAlarm;
@@ -1012 +1014 @@
-
-  public BwFreeBusy getFreeBusy(BwCalendar cal, BwPrincipal who,
-
+
+
-          throws CalFacadeException {
-    if (!(who instanceof BwUser)) {
@@ -1031 +1034 @@
-      subs = new ArrayList();
-      subs.add(sub);
-!
+
-      subs = getSubscriptions();
-    } else {
@@ -1038 +1041 @@
-
-    BwFreeBusy fb = new BwFreeBusy(who, start, end);
+    Collection events = new TreeSet();
-
-    Iterator subit = subs.iterator();
@@ -1050 +1054 @@
-                                 CalFacadeDefs.retrieveRecurExpanded);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-         */
-        BwFreeBusyComponent fbc = new BwFreeBusyComponent();
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-          }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-          }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-          }
-
-          eventPeriods.add(new EventPeriod(new DateTime(dstart),
-              new DateTime(dend)));
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          fbc.addPeriod(p);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-

trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java

@@ -59 +59 @@
-import org.bedework.calfacade.BwCategory;
-import org.bedework.calfacade.BwDateTime;
+import org.bedework.calfacade.BwDuration;
-import org.bedework.calfacade.BwEvent;
-import org.bedework.calfacade.BwEventAlarm;
@@ -796 +797 @@
-   * ==================================================================== */
-
-
+
+
+
+
-   *
-   * @param cal    Calendar to provide free-busy for. Null for default
@@ -803 +807 @@
-   * @param start
-   * @param end
+   * @param granularity BwDuration object defining how to divide free/busy
+   *                    null for one big glob. or set to e.g. 1 hour for
+   *                    hourly chunks.
-   * @return BwFreeBusy
-   * @throws CalFacadeException
-   */
-  public abstract BwFreeBusy getFreeBusy(BwCalendar cal, BwPrincipal who,
-
+
+
-          throws CalFacadeException;
-

trunk/calendar3/webclient/src/org/bedework/webclient/BwFreeBusyAction.java

@@ -57 +57 @@
-//import org.bedework.calfacade.BwDateTime;
-import org.bedework.appcommon.MyCalendarVO;
+import org.bedework.calfacade.BwDuration;
-import org.bedework.calfacade.BwFreeBusy;
-import org.bedework.calfacade.BwFreeBusyComponent;
-import org.bedework.calfacade.BwUser;
-import org.bedework.calfacade.CalFacadeUtil;
@@ -64 +64 @@
-import org.bedework.calsvci.CalSvcI;
-
-
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Iterator;
-import javax.servlet.http.HttpServletRequest;
-
@@ -128 +125 @@
-    }
-
-    int intunit = Calendar.HOUR;
-    String intunitStr = getReqPar(request, "intunit");
+    BwDuration dur = new BwDuration();
-
-    if (intunitStr != null) {
-      if ("minutes".equals(intunitStr)) {
-intunit = Calendar.MINUTE
+dur.setMinutes(interval)
-      } else if ("hours".equals(intunitStr)) {
-intunit = Calendar.HOUR
+dur.setHours(interval)
-      } else if ("days".equals(intunitStr)) {
-intunit = Calendar.DAY_OF_MONTH
+dur.setDays(interval)
-      } else if ("weeks".equals(intunitStr)) {
-
-
-
+
-      } else {
-        form.getErr().emit("org.bedework.client.error.badintervalunit");
-        return "error";
-      }
+    } else {
+      dur.setHours(interval);
-    }
-
@@ -151 +148 @@
-    CalTimezones tzs = svci.getTimezones();
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    }
-
-
+
+
+
+
-
-    form.assignFreeBusy(fb);