diff --git a/src/org/calacademy/antweb/Login.java b/src/org/calacademy/antweb/Login.java index 49607d8c..5a6f13bc 100755 --- a/src/org/calacademy/antweb/Login.java +++ b/src/org/calacademy/antweb/Login.java @@ -136,7 +136,14 @@ public Boolean isUploadImages() { public void setIsUploadImages(boolean isUploadImages) { this.isUploadImages = isUploadImages; } - + + private String uploadAs = null; + public void setUploadAs(String uploadAs) { + this.uploadAs = uploadAs; + } + public String getUploadAs() { + return uploadAs; + } public ArrayList getProjects() { return projects; diff --git a/src/org/calacademy/antweb/curate/login/SaveLoginAction.java b/src/org/calacademy/antweb/curate/login/SaveLoginAction.java index 75bccaea..3ef317ab 100755 --- a/src/org/calacademy/antweb/curate/login/SaveLoginAction.java +++ b/src/org/calacademy/antweb/curate/login/SaveLoginAction.java @@ -77,6 +77,7 @@ public ActionForward execute(ActionMapping mapping, ActionForm f, login.setIsAdmin(form.isAdmin()); login.setIsUploadSpecimens(form.isUploadSpecimens()); login.setIsUploadImages(form.isUploadImages()); + login.setUploadAs(form.getUploadAs()); // Handle Projects Access String[] projects = form.getProjects(); diff --git a/src/org/calacademy/antweb/curate/login/SaveLoginForm.java b/src/org/calacademy/antweb/curate/login/SaveLoginForm.java index b26a25f8..daab52cd 100755 --- a/src/org/calacademy/antweb/curate/login/SaveLoginForm.java +++ b/src/org/calacademy/antweb/curate/login/SaveLoginForm.java @@ -154,6 +154,15 @@ public void setChangePassword(String changePassword) { this.changePassword = changePassword; } + private String uploadAs; + public String getUploadAs() { + return uploadAs; + } + public void setUploadAs(String uploadAs) { + this.uploadAs = uploadAs; + } + + public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) { ActionErrors errors = null; diff --git a/src/org/calacademy/antweb/home/LoginDb.java b/src/org/calacademy/antweb/home/LoginDb.java index 45dd136c..56c7c5f3 100755 --- a/src/org/calacademy/antweb/home/LoginDb.java +++ b/src/org/calacademy/antweb/home/LoginDb.java @@ -216,6 +216,8 @@ private Curator instantiateCurator(ResultSet rset) login.setIsUploadSpecimens(rset.getBoolean("is_upload_specimens")); login.setIsUploadImages(rset.getBoolean("is_upload_images")); + login.setUploadAs(rset.getString("upload_as")); + if (login.getId() == 0) return null; return login; } @@ -260,6 +262,8 @@ private Login instantiate(Login login, ResultSet rset) //curator.getGroup().setCurator(curator); // backwards, but allows code to remain unchanged. login.setIsUploadSpecimens(rset.getBoolean("is_upload_specimens")); login.setIsUploadImages(rset.getBoolean("is_upload_images")); + + login.setUploadAs(rset.getString("upload_as")); } return login; } @@ -493,8 +497,8 @@ public void saveLogin(Login login) throws SQLException, AntwebException { } String theInsert = "insert into login" + - " (id, name, first_name, last_name, email, password, group_id, is_admin, is_upload_specimens, is_upload_images)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + " (id, name, first_name, last_name, email, password, group_id, is_admin, is_upload_specimens, is_upload_images, upload_as)" + + " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; //s_log.info("saveLogin() insert:" + theInsert); @@ -514,6 +518,7 @@ public void saveLogin(Login login) throws SQLException, AntwebException { stmt.setInt(8, isAdmin); stmt.setInt(9, uploadSpecimens); stmt.setInt(10, uploadImages); + stmt.setString(11, login.getUploadAs()); stmt.executeUpdate(); //s_log.warn("saveLogin() isAdmin:" + login.isAdmin() + " projects:" + login.getProjects()); @@ -592,7 +597,7 @@ public void updateLogin(Login login, Login accessLogin) throws SQLException { stmt.setInt(6, login.getId()); } else if (isAdminUpdate && !isSelfUpdate) { String adminUpdate = "update login " - + "set name = ?, first_name = ?, last_name = ?, email = ?, group_id = ?, is_admin = ?, is_upload_specimens = ?, is_upload_images = ? " + + "set name = ?, first_name = ?, last_name = ?, email = ?, group_id = ?, is_admin = ?, is_upload_specimens = ?, is_upload_images = ?, upload_as = ? " + "where id = ?"; theUpdate = adminUpdate; @@ -606,10 +611,11 @@ public void updateLogin(Login login, Login accessLogin) throws SQLException { stmt.setInt(6, isAdmin); stmt.setInt(7, uploadSpecimens); stmt.setInt(8, uploadImages); - stmt.setInt(9, login.getId()); + stmt.setString(9, login.getUploadAs()); + stmt.setInt(10, login.getId()); } else if (isAdminUpdate && isSelfUpdate) { String adminSelfUpdate = "update login " - + "set name = ?, first_name = ?, last_name = ?, email = ?, password = ?, group_id = ?, is_admin = ?, is_upload_specimens = ?, is_upload_images = ? " + + "set name = ?, first_name = ?, last_name = ?, email = ?, password = ?, group_id = ?, is_admin = ?, is_upload_specimens = ?, is_upload_images = ?, upload_as = ? " + "where id = ?"; theUpdate = adminSelfUpdate; @@ -624,7 +630,8 @@ public void updateLogin(Login login, Login accessLogin) throws SQLException { stmt.setInt(7, isAdmin); stmt.setInt(8, uploadSpecimens); stmt.setInt(9, uploadImages); - stmt.setInt(10, login.getId()); + stmt.setString(10, login.getUploadAs()); + stmt.setInt(11, login.getId()); } //A.log("updateLogin() update:" + DBUtil.getPreparedStatementString(stmt)); diff --git a/web/curate/curate-body.jsp b/web/curate/curate-body.jsp index b64fc388..9479938b 100755 --- a/web/curate/curate-body.jsp +++ b/web/curate/curate-body.jsp @@ -132,16 +132,6 @@ Need Help? Check out the - - - - - - - - -

Specimen Data

@@ -149,54 +139,67 @@ Need Help? Check out the
-
-
Upload Specimen File:
   (tab-delimited .txt file)
-
-
- -
-
+ + - <% if (AntwebProps.isDevMode()) { - if (true) { %> -
-
-
- <% } else { %> -
- Update entire the biota file -
- <% } %> - <% } else { %> - - <% } %> - - <% if (false && LoginMgr.isCurator(accessLogin)) { // || accessLogin.getId() == 16) { // || accessLogin.getId() == 338 %> -
- +
- <% } %> +
-To calculate the taxon children counts run the Count Crawls/image/new1.png width=20> -
If not returned an upload report, find it in the Specimen Upload Reports. +
+   Upload as: + +
-
>
-
- + <% } %> + <% } else { %> + + + + <% } %> +
>
+
+To calculate the taxon children counts run the Count Crawls/image/new1.png width=20> +
If not returned an upload report, find it in the Specimen Upload Reports.

+
+ + + +
@@ -343,115 +346,6 @@ To calculate the taxon children counts run the