X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fapi%2FCATSImport.java;h=49960cd45387c2caf9cdced6d090cda761c35835;hb=c3feb67ae28e66765dfcd2e7d50ddbceb64d92db;hp=69feb299f0be07bf5322edb9a607001e118937d2;hpb=31bd86b7903b06266a84b3350914858c8a207b35;p=gigi.git diff --git a/src/org/cacert/gigi/api/CATSImport.java b/src/org/cacert/gigi/api/CATSImport.java index 69feb299..49960cd4 100644 --- a/src/org/cacert/gigi/api/CATSImport.java +++ b/src/org/cacert/gigi/api/CATSImport.java @@ -30,7 +30,13 @@ public class CATSImport extends APIPoint { String testType = req.getParameter("variant"); String date = req.getParameter("date"); if (target == null || testType == null || date == null) { - resp.sendError(500, "Error, requires serial, variant and date"); + resp.sendError(500, "Error, requires mid, variant and date"); + return; + } + String language = req.getParameter("language"); + String version = req.getParameter("version"); + if (language == null || version == null) { + resp.sendError(500, "Error, requires also language and version"); return; } int id; @@ -42,12 +48,12 @@ public class CATSImport extends APIPoint { } CertificateOwner o = CertificateOwner.getById(id); if ( !(o instanceof User)) { - resp.sendError(500, "Error, requires valid serial"); + resp.sendError(500, "Error, requires valid userid"); return; } System.out.println("CATS: " + target + ": " + testType); User targetUser = (User) o; System.out.println(targetUser.getId()); - CATS.enterResult(targetUser, testType, new Date(Long.parseLong(date))); + CATS.enterResult(targetUser, testType, new Date(Long.parseLong(date)), language, version); } }