| 9,6 → 9,8 |
|---|
| import org.apache.struts.action.ActionForward; |
| import org.apache.log4j.Logger; |
| import ak.photoalbum.util.FileUtils; |
| import ak.photoalbum.logic.Logic; |
| import ak.photoalbum.logic.IndexEntry; |
| |
| public final class IndexAction |
| extends BaseAction |
| 20,6 → 22,7 |
|---|
| throws Exception |
| { |
| IndexForm theForm = (IndexForm)form; |
| String branch = theForm.getBranch(); |
| String dir = theForm.getPath(); |
| int page = theForm.getPageInt(); |
| IndexEntry entry = new IndexEntry(); |
| 33,8 → 36,8 |
|---|
| if(dir == null) dir = ""; // the images root |
| |
| logger.info("get index for " + dir); |
| Logic.getLogic().getEntry(dir, entry, top, prev, current, next); |
| if(!Logic.getLogic().listDirectory(dir, page, index, pages)) |
| Logic.getLogic().getEntry(branch, dir, entry, top, prev, current, next); |
| if(!Logic.getLogic().listDirectory(branch, dir, page, index, pages)) |
| return mapping.findForward("error"); |
| |
| request.setAttribute("dir", FileUtils.replaceFileSeparator(dir, " - ")); |