Skip to content

Commit

Permalink
WB-1615: part 2 (remove printlns)
Browse files Browse the repository at this point in the history
  • Loading branch information
holmbergius committed Apr 30, 2021
1 parent e462d02 commit a414be2
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions src/main/java/org/ecocean/servlet/ProjectGet.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
res.put("success",false);
JSONObject j = ServletUtilities.jsonFromHttpServletRequest(request);

//System.out.println("Here 1");


boolean getEncounterMetadata = false;
String getEncounterMetadataOpt = j.optString("getEncounterMetadata", null);
Expand All @@ -68,7 +68,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
getUserIncrementalIds = true;
}

//System.out.println("Here 2");


String projectUUID = null;
String ownerId = null;
Expand Down Expand Up @@ -298,38 +298,38 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
}

//get specific project
//System.out.println("Here 7");

projectIdPrefix = j.optString("projectIdPrefix", null);
projectUUID = j.optString("projectUUID", null);
if ((Util.stringExists(projectIdPrefix)|| Util.stringExists(projectUUID))&&!complete) {
//System.out.println("Here 8");

Project project = null;
if (Util.stringExists(projectIdPrefix)) {
project = myShepherd.getProjectByProjectIdPrefix(projectIdPrefix);
//System.out.println("Here 8a");

}
if (Util.stringExists(projectUUID)) {
project = myShepherd.getProject(projectUUID);
//System.out.println("Here 8b");

}

JSONArray projectArr = new JSONArray();
//System.out.println("Here 9");

if (project!=null) {
//System.out.println("Here 9a");

if (getEncounterMetadata) {
//System.out.println("Here 9b");

projectArr.put(project.asJSONObjectWithEncounterMetadata(myShepherd, request));
//System.out.println("Here 9c");

} else {
projectArr.put(project.asJSONObject());
//System.out.println("Here 9d");

}
}
//System.out.println("Here 10");

if (getEditPermission!=null&&"true".equals(getEditPermission)) {
User user = myShepherd.getUser(request);
//System.out.println("Here 10a");

res.put("userCanEdit","false");
if (user!=null&&(user.hasRoleByName("admin", myShepherd)||user.getId().equals(project.getOwnerId()))) {
res.put("userCanEdit","true");
Expand All @@ -339,9 +339,9 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
response.setStatus(HttpServletResponse.SC_OK);
res.put("success",true);
complete = true;
//System.out.println("Here 11");

}
//System.out.println("Here 12");

out.println(res);
out.close();

Expand Down

0 comments on commit a414be2

Please sign in to comment.