Update of /cvsroot/roller/roller/src/org/roller/presentation/weblog/actions
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5448/src/org/roller/presentation/weblog/actions
Modified Files:
ExportEntriesAction.java ImportEntriesAction.java
Log Message:
More Export/Import work. Import still isn't working for some damn reason!
Index: ExportEntriesAction.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ExportEntriesAction.java 16 Apr 2004 02:42:38 -0000 1.4
--- ExportEntriesAction.java 17 Apr 2004 03:04:09 -0000 1.5
***************
*** 7,10 ****
--- 7,12 ----
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+ import org.apache.struts.action.ActionMessage;
+ import org.apache.struts.action.ActionMessages;
import org.apache.struts.actions.DispatchAction;
import org.apache.struts.util.RequestUtils;
***************
*** 14,18 ****
import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerRequest;
- import org.roller.presentation.RollerSession;
import org.roller.presentation.velocity.ExportRss;
import org.roller.presentation.weblog.formbeans.ExportEntriesForm;
--- 16,19 ----
***************
*** 124,128 ****
ExportEntriesForm form = (ExportEntriesForm)actionForm;
if ( rreq.isUserAuthorizedToEdit() )
! {
Locale locale =
Locale.getDefault();//rreq.getWebsite().getLocaleInstance();
final DateFormat df =
DateFormat.getDateInstance(DateFormat.SHORT, locale);
--- 125,132 ----
ExportEntriesForm form = (ExportEntriesForm)actionForm;
if ( rreq.isUserAuthorizedToEdit() )
! {
! request.setAttribute("model",
! new BasePageModel(request, response,
mapping));
!
Locale locale =
Locale.getDefault();//rreq.getWebsite().getLocaleInstance();
final DateFormat df =
DateFormat.getDateInstance(DateFormat.SHORT, locale);
***************
*** 147,150 ****
--- 151,156 ----
rreq.getUser().getUserName(), null, startDate,
endDate, false);
//System.out.println("Export: got " + entries.size() + "
entries.");
+
+ ActionMessages messages = writeSuccessMessage(request,
response, rreq, form);
// seperate the entries as specified: day, month, year
***************
*** 158,161 ****
--- 164,168 ----
exporter.setExportAtom(true);
}
+ ArrayList fileNames = new ArrayList();
Iterator it = entryMap.keySet().iterator();
while(it.hasNext())
***************
*** 163,169 ****
String key = (String)it.next();
ArrayList list = (ArrayList)entryMap.get(key);
- //System.out.println("Export: got " + list.size() + "
entries for " + key);
exporter.exportEntries(list, key+"_"+exportTo+".xml");
}
}
else
--- 170,191 ----
String key = (String)it.next();
ArrayList list = (ArrayList)entryMap.get(key);
exporter.exportEntries(list, key+"_"+exportTo+".xml");
+ fileNames.add("Exported " + list.size() + " entry(s)
to " + key+"_"+exportTo+".xml<br />");
+ //System.out.println("Exported: " + list.size() + "
entries for " + key);
+ }
+
+ StringBuffer fileMessage = new StringBuffer();
+ it = fileNames.iterator();
+ while (it.hasNext())
+ {
+ fileMessage.append((String)it.next());
+ }
+ if (fileMessage.length() > 0)
+ {
+ messages.add(ActionMessages.GLOBAL_MESSAGE,
+ new
ActionMessage("weblogEntryExport.exportFiles",
+
fileMessage.toString()));
}
+ saveMessages(request, messages);
}
else
***************
*** 173,178 ****
}
! //writeSuccessMessage(request, response, rreq, form);
! forward = mapping.findForward("exportEntries.done");
}
else
--- 195,199 ----
}
! //forward = mapping.findForward("exportEntries.done");
}
else
***************
*** 229,233 ****
}
! private void writeSuccessMessage(HttpServletRequest request,
HttpServletResponse response, RollerRequest rreq, ExportEntriesForm form)
throws MalformedURLException
{
PageContext pageContext =
--- 250,254 ----
}
! private ActionMessages writeSuccessMessage(HttpServletRequest request,
HttpServletResponse response, RollerRequest rreq, ExportEntriesForm form)
throws MalformedURLException
{
PageContext pageContext =
***************
*** 241,250 ****
"uploadFiles", params, (String)null, false);
! request.getSession().setAttribute(
! RollerSession.STATUS_MESSAGE,
! "Exporting Entries from " +
! form.getStartDateString() + " to " +
! form.getEndDateString() + ".<br />" +
! "Check your <a href=\"" + filesLink + "\">Files</a>");
}
}
--- 262,276 ----
"uploadFiles", params, (String)null, false);
! String message =
! "Exporting Entries from " +
! form.getStartDateString() + " to " +
! form.getEndDateString() + ".<br />" +
! "Check your <a href=\"" + filesLink + "\">Files</a>.";
!
! ActionMessages messages = new ActionMessages();
! messages.add(ActionMessages.GLOBAL_MESSAGE,
! new ActionMessage("weblogEntryExport.exportSuccess",
message));
!
! return messages;
}
}
Index: ImportEntriesAction.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/presentation/weblog/actions/ImportEntriesAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ImportEntriesAction.java 5 Apr 2004 11:43:32 -0000 1.1
--- ImportEntriesAction.java 17 Apr 2004 03:04:09 -0000 1.2
***************
*** 10,13 ****
--- 10,15 ----
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+ import org.apache.struts.action.ActionMessage;
+ import org.apache.struts.action.ActionMessages;
import org.apache.struts.actions.DispatchAction;
import org.roller.pojos.UserData;
***************
*** 15,19 ****
import org.roller.presentation.RollerContext;
import org.roller.presentation.RollerRequest;
- import org.roller.presentation.RollerSession;
import org.roller.presentation.pagecache.OSCacheFilterHandler;
import org.roller.presentation.pagecache.PageCache;
--- 17,20 ----
***************
*** 75,80 ****
if (buf.length() > 0)
{
! request.getSession().setAttribute(
! RollerSession.STATUS_MESSAGE, buf.toString());
// Flush the page cache
--- 76,83 ----
if (buf.length() > 0)
{
! ActionMessages messages = new ActionMessages();
! messages.add(ActionMessages.GLOBAL_MESSAGE,
! new
ActionMessage("weblogEntryExport.importFiles",
! buf.toString()));
// Flush the page cache
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
|
