You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/08/28 04:50:39 UTC
svn commit: r437512 - in
/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tags/calendar:
BigWeblogCalendarModel.java WeblogCalendarModel.java
Author: snoopdave
Date: Sun Aug 27 19:50:37 2006
New Revision: 437512
URL: http://svn.apache.org/viewvc?rev=437512&view=rev
Log:
Fixing class cast exception in big calendar
Modified:
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tags/calendar/BigWeblogCalendarModel.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tags/calendar/WeblogCalendarModel.java
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tags/calendar/BigWeblogCalendarModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tags/calendar/BigWeblogCalendarModel.java?rev=437512&r1=437511&r2=437512&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tags/calendar/BigWeblogCalendarModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tags/calendar/BigWeblogCalendarModel.java Sun Aug 27 19:50:37 2006
@@ -58,7 +58,7 @@
super(pRequest, cat);
}
-
+
/**
* @param startDate
* @param endDate
@@ -144,4 +144,40 @@
}
return content;
}
+
+ /**
+ * Create URL for use on view-weblog page
+ * @param day Day for URL or null if no entries on that day
+ * @param alwaysURL Always return a URL, never return null
+ * @return URL for day, or null if no weblog entry on that day
+ */
+ public String computeUrl(Date day, boolean monthURL, boolean alwaysURL)
+ {
+ String url = null;
+ // get the 8 char YYYYMMDD datestring for day, returns null
+ // if no weblog entry on that day
+ String dateString = null;
+ List entries = (List)monthMap.get( day );
+ if ( entries != null && day != null )
+ {
+ WeblogEntryData entry = (WeblogEntryData)entries.get(0);
+ dateString = mStarDateFormat.format(entry.getPubTime());
+ }
+ if (dateString == null && !alwaysURL) return null;
+ else if (dateString == null && !monthURL) {
+ dateString = DateUtil.format8chars(day);
+ } else if (dateString == null && monthURL) {
+ dateString = DateUtil.format6chars(day);
+ }
+ try {
+ if (pageLink == null) { // create date URL
+ url = URLUtilities.getWeblogCollectionURL(weblog, locale, cat, dateString, -1, false);
+ } else { // create page URL
+ url = URLUtilities.getWeblogPageURL(weblog, locale, pageLink, null, cat, dateString, -1, false);
+ }
+ } catch (Exception e) {
+ mLogger.error("ERROR: creating URL",e);
+ }
+ return url;
+ }
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tags/calendar/WeblogCalendarModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tags/calendar/WeblogCalendarModel.java?rev=437512&r1=437511&r2=437512&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tags/calendar/WeblogCalendarModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tags/calendar/WeblogCalendarModel.java Sun Aug 27 19:50:37 2006
@@ -86,7 +86,7 @@
}
- private void initDay(Date month) {
+ protected void initDay(Date month) {
this.day = day;
calendar = Calendar.getInstance(
weblog.getTimeZoneInstance(),
@@ -111,7 +111,7 @@
cal.set(Calendar.MILLISECOND, cal.getMaximum(Calendar.MILLISECOND));
Date endDate = cal.getTime();
- loadWeblogEntries(startDate, endDate);
+ loadWeblogEntries(startDate, endDate, cat);
}
@@ -119,14 +119,14 @@
* @param startDate
* @param endDate
*/
- protected void loadWeblogEntries(Date startDate, Date endDate) {
+ protected void loadWeblogEntries(Date startDate, Date endDate, String catName) {
try {
WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
monthMap = mgr.getWeblogEntryStringMap(
weblog, // website
startDate, // startDate
endDate, // endDate
- cat, // cat
+ catName, // cat
WeblogEntryData.PUBLISHED, // status
locale,
0, -1);