Fixed compilation errors
This commit is contained in:
parent
9c91d96ce7
commit
0066560d2c
12 changed files with 344 additions and 372 deletions
|
|
@ -12,68 +12,67 @@ import javax.servlet.http.HttpSession;
|
|||
import zall.action.ZalleryAction;
|
||||
import zall.bean.Folder;
|
||||
import zall.bean.User;
|
||||
import zall.util.UserMessage;
|
||||
import zall.util.UserMessage.MessageType;
|
||||
import zutil.db.DBConnection;
|
||||
import zutil.log.LogUtil;
|
||||
import zutil.ui.UserMessageManager;
|
||||
import zutil.ui.UserMessageManager.MessageLevel;
|
||||
import zutil.ui.UserMessageManager.UserMessage;
|
||||
|
||||
public class CreateFolderAction extends ZalleryAction{
|
||||
private static final Logger logger = LogUtil.getLogger();
|
||||
public class CreateFolderAction extends ZalleryAction {
|
||||
private static final Logger logger = LogUtil.getLogger();
|
||||
|
||||
public CreateFolderAction() {
|
||||
super("mkdir", true);
|
||||
}
|
||||
public CreateFolderAction() {
|
||||
super("mkdir", true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session,
|
||||
PrintWriter out, User user, UserMessage msgs) throws SQLException, IOException {
|
||||
@Override
|
||||
public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session,
|
||||
PrintWriter out, User user, UserMessageManager msgs) throws SQLException, IOException {
|
||||
|
||||
// Create Folder
|
||||
String path = request.getParameter("dir");
|
||||
Folder folder = Folder.load(db, path, user);
|
||||
logger.info( "Creating new folder: /"+user.getName()+"/"+path );
|
||||
// parent folder
|
||||
if( folder == null ){
|
||||
String[] dirs = path.split("/");
|
||||
Folder parent = Folder.loadRoot(db, user);
|
||||
if( user.isSuperUser() && path.charAt(0) == '/' )
|
||||
path = "";
|
||||
else{
|
||||
path = "/{NAME}";
|
||||
// Create Folder
|
||||
String path = request.getParameter("dir");
|
||||
Folder folder = Folder.load(db, path, user);
|
||||
logger.info("Creating new folder: /" + user.getName() + "/" + path);
|
||||
// parent folder
|
||||
if (folder == null) {
|
||||
String[] dirs = path.split("/");
|
||||
Folder parent = Folder.loadRoot(db, user);
|
||||
if (user.isSuperUser() && path.charAt(0) == '/')
|
||||
path = "";
|
||||
else {
|
||||
path = "/{NAME}";
|
||||
|
||||
// Get root folder
|
||||
parent = Folder.load(db, path, user); // Get user root folder
|
||||
if( parent == null ){ // Create root folder
|
||||
parent = Folder.loadRoot(db, user); // get root folder
|
||||
folder = new Folder();
|
||||
folder.setUser( user );
|
||||
folder.setParent( parent );
|
||||
folder.setName( "{NAME}" );
|
||||
folder.save( db );
|
||||
parent = folder;
|
||||
}
|
||||
}
|
||||
// Get root folder
|
||||
parent = Folder.load(db, path, user); // Get user root folder
|
||||
if (parent == null) { // Create root folder
|
||||
parent = Folder.loadRoot(db, user); // get root folder
|
||||
folder = new Folder();
|
||||
folder.setUser(user);
|
||||
folder.setParent(parent);
|
||||
folder.setName("{NAME}");
|
||||
folder.save(db);
|
||||
parent = folder;
|
||||
}
|
||||
}
|
||||
|
||||
for(String dir : dirs){
|
||||
if( dir.trim().isEmpty() ) // skip empty names
|
||||
continue;
|
||||
path += "/"+dir;
|
||||
folder = Folder.load(db, path, user);
|
||||
if(folder == null){ // create folder
|
||||
folder = new Folder();
|
||||
folder.setUser( user );
|
||||
folder.setParent( parent );
|
||||
folder.setName( dir );
|
||||
folder.save( db );
|
||||
}
|
||||
parent = folder;
|
||||
}
|
||||
if(out != null) out.print( "{\"id\":"+folder.getId()+", \"name\":\""+folder.getPath()+"\"}" );
|
||||
else msgs.add(MessageType.INFO, "Folder '"+path+"' has been successfully created.!");
|
||||
}
|
||||
else if(out != null) out.println("{\"error\":\"The folder '"+path+"' already exists!\"}");
|
||||
else msgs.add(MessageType.ERROR, "The folder '"+path+"' already exists!");
|
||||
return;
|
||||
}
|
||||
for (String dir : dirs) {
|
||||
if (dir.trim().isEmpty()) // skip empty names
|
||||
continue;
|
||||
path += "/" + dir;
|
||||
folder = Folder.load(db, path, user);
|
||||
if (folder == null) { // create folder
|
||||
folder = new Folder();
|
||||
folder.setUser(user);
|
||||
folder.setParent(parent);
|
||||
folder.setName(dir);
|
||||
folder.save(db);
|
||||
}
|
||||
parent = folder;
|
||||
}
|
||||
msgs.add(new UserMessage(MessageLevel.INFO, "Folder '" + path + "' has been successfully created.!"));
|
||||
} else
|
||||
msgs.add(new UserMessage(MessageLevel.ERROR, "The folder '" + path + "' already exists!"));
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue