From 2fd53470193f5df982bc494dca6ac744aead3f7c Mon Sep 17 00:00:00 2001 From: David Hovemeyer Date: Fri, 27 Jan 2017 11:07:55 -0500 Subject: [PATCH] include testname in summary results this is the "problem name"; previously was only including the brief description this changes the format of the CSV slightly (only the "preamble" at the beginning of the results) --- .../src/org/cloudcoder/app/server/admin/Problems.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CloudCoder/src/org/cloudcoder/app/server/admin/Problems.java b/CloudCoder/src/org/cloudcoder/app/server/admin/Problems.java index c0764c5d..ff99ffee 100644 --- a/CloudCoder/src/org/cloudcoder/app/server/admin/Problems.java +++ b/CloudCoder/src/org/cloudcoder/app/server/admin/Problems.java @@ -71,7 +71,10 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) if (problemURLInfo.getProblemId() < 0) { summarizeProblems(user, course, resp); } else { - // Load the problem (is this actually necessary?) + // Load the problem. + // This is necessary because the returned CSV data + // may include problem metadata (such as testname and + // brief description.) Problem problem = new Problem(); problem.setProblemId(problemURLInfo.getProblemId()); if (!Database.getInstance().reloadModelObject(problem)) { @@ -158,10 +161,11 @@ private void summarizeStudentWorkOnProblem(User user, Course course, int section @SuppressWarnings("resource") CSVWriter writer = new CSVWriter(resp.getWriter()); - String problemName = Database.getInstance().getProblem(problem.getProblemId()).getBriefDescription(); + String problemName = problem.getTestname(); + String briefDesc = problem.getBriefDescription(); int numTests = Database.getInstance().getTestCasesForProblem(problem.getProblemId()).size(); - writer.writeNext(new String[]{course.getName(), problemName}); + writer.writeNext(new String[]{course.getName(), problemName, briefDesc}); writer.writeNext(new String[]{}); writer.writeNext(BEST_SUBMISSION_HEADER);