Merge changes I82859d98,I3da54fbf

[gigi.git] / src / org / cacert / gigi / api / CATSImport.java

diff --git a/src/org/cacert/gigi/api/CATSImport.java b/src/org/cacert/gigi/api/CATSImport.java
index 69feb299f0be07bf5322edb9a607001e118937d2..49960cd45387c2caf9cdced6d090cda761c35835 100644 (file)
--- 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);
     }
 }