Commit 1f80727a authored by Robert Butora's avatar Robert Butora
Browse files

replaces DataLink -> MCutResult in doMCutout

parent 281a1523

data-access/servlet/src/main/java/common/output/MCutResult.java

+14 −6
Original line number Diff line number Diff line 






class MCutResult

{



   class Cut

   {

      public enum ContentType {FILENAME, BAD_REQUEST, SERVICE_ERROR};

      public Inputs inputs;
@@ -10,3 +12,9 @@ class MCutResult 
      public String content;

   }





   public String fileName;

   public long fileSize;

   Cut[] cutResArr;

}

data-access/servlet/src/main/java/cutout/Datasets.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ public interface Datasets 
      throws FileNotFoundException, IOException;





   public DataLink doMCutout(String jdlJson)

   public MCutResult doMCutout(String jdlJson)

      throws IOException;



}

data-access/servlet/src/main/java/cutout/DatasetsImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ class DatasetsImpl implements Datasets 






   public DataLink doMCutout(String jdlJson)

   public MCutResult doMCutout(String jdlJson)

         throws IOException

      {

         LOGGER.info("trace");

data-access/servlet/src/main/java/cutout/json/JdlMCutout.java

+15 −15
Original line number Diff line number Diff line
@@ -101,11 +101,11 @@ public class JdlMCutout 






   public static DataLink responseFromMCutoutJson(String response)

   public static MCutResult responseFromMCutoutJson(String response)

      // throws ParseException

   {   

      DataLink dlk = new DataLink();



      MCutResult cuts = new MCutResult();

      try {

         JSONParser parser = new JSONParser();

         Object jsonObj = parser.parse(response);
@@ -132,7 +132,7 @@ public class JdlMCutout 


            JSONArray jsonArray = (JSONArray)jsonObject.get("responses");



            MCutResult[] mcutResArr = new MCutResult[jsonArray.size()];

            MCutResult.Cut[] cutResArr = new MCutResult.Cut[jsonArray.size()];



            int i = 0;

            @SuppressWarnings("unchecked")
@@ -141,21 +141,21 @@ public class JdlMCutout 
            {

               JSONObject jObj = itr.next();



               mcutResArr[i].inputs  = (Inputs)jObj.get("input");

               cutResArr[i].inputs  = (Inputs)jObj.get("input");

               String ctype = (String)jObj.get("type");

               if(ctype.equals("FILENAME"))

                  mcutResArr[i].contentType = MCutResult.ContentType.FILENAME;

                  cutResArr[i].contentType = MCutResult.Cut.ContentType.FILENAME;

               else if(ctype.equals("BAD_REQUEST"))

                  mcutResArr[i].contentType = MCutResult.ContentType.BAD_REQUEST;

                  cutResArr[i].contentType = MCutResult.Cut.ContentType.BAD_REQUEST;

               else if(ctype.equals("SERVICE_ERROR"))

                  mcutResArr[i].contentType = MCutResult.ContentType.SERVICE_ERROR;

               mcutResArr[i].content = (String)jObj.get("content");

                  cutResArr[i].contentType = MCutResult.Cut.ContentType.SERVICE_ERROR;

               cutResArr[i].content = (String)jObj.get("content");

               i++;

            }



            dlk.contentLength = fileSize;

            dlk.accessUrl     = fileName;

            dlk.mcutResultArr = mcutResArr;

            cuts.fileSize = fileSize;

            cuts.fileName = fileName;

            cuts.cutResArr = cutResArr;

         }

      }

      catch  (ParseException e)
@@ -163,7 +163,7 @@ public class JdlMCutout 
         e.printStackTrace();

         throw new IllegalStateException("Internal system error.");

      }

      return dlk;

      return cuts;

   }

data-access/servlet/src/main/java/cutout/json/JsonDecoder.java

+2 −2
Original line number Diff line number Diff line
@@ -14,13 +14,13 @@ import org.json.simple.parser.ParseException; 
//

// 1. exception (decoded inside 2 3)

//

// 2. response from cutout:   struct cutout_res_s  --> DataLink

// 2. response from cutout:   struct cutout_res_s  --> CutResult

//    .filesize

//    .filename

//    .nullval_count : {fill_ratio null_count total_count}

//

// NOTE: MCutout moved to -> dacc/JdlMCutout.java

// 3. response from mcutout:  struct mcutout_res_s --> DataLink

// 3. response from mcutout:  struct mcutout_res_s --> MCutResult

//    .filesize

//    .tgz_filename

//    .cut_resp_s[] : {cut_param_s content_type content}