| @@ -19,18 +19,26 @@ |
| public static ModelArchive getModelArchive(String serviceName, Document doc) { |
| ModelArchive model = null; |
| |
| - if (serviceName.contains("weps/5.2")) { |
| - model = new WEPSModelArchive(doc.getString("_id"), |
| - doc.getString("ctime"), |
| - doc.getString("etime"), |
| - serviceName, |
| - doc.getString("status"), |
| - doc.getString("req_ip"), |
| - doc.getString("filename") |
| + model = getModelArchive(serviceName, doc, false); |
| + |
| + return model; |
| + } |
| + |
| + public static ModelArchive getModelArchive(String serviceName, Document doc, boolean returnBasicArchive) { |
| + ModelArchive model = null; |
| + |
| + if (returnBasicArchive) { |
| + model = new ModelArchive(doc.getString("_id"), |
| + doc.getString("ctime"), |
| + doc.getString("etime"), |
| + serviceName, |
| + doc.getString("status"), |
| + doc.getString("req_ip"), |
| + doc.getString("filename") |
| ); |
| } else { |
| - if (serviceName.contains("wepp/")) { |
| - model = new WEPPModelArchive(doc.getString("_id"), |
| + if (serviceName.contains("weps/5.2")) { |
| + model = new WEPSModelArchive(doc.getString("_id"), |
| doc.getString("ctime"), |
| doc.getString("etime"), |
| serviceName, |
| @@ -39,14 +47,24 @@ |
| doc.getString("filename") |
| ); |
| } else { |
| - //Not a service we are interested in... |
| + if (serviceName.contains("wepp/")) { |
| + model = new WEPPModelArchive(doc.getString("_id"), |
| + doc.getString("ctime"), |
| + doc.getString("etime"), |
| + serviceName, |
| + doc.getString("status"), |
| + doc.getString("req_ip"), |
| + doc.getString("filename") |
| + ); |
| + } else { |
| + //Not a service we are interested in... |
| + } |
| } |
| } |
| |
| return model; |
| } |
| |
| - |
| public static ModelArchive getModelArchive(String serviceName, Document doc, byte[] fileData) throws IOException, JSONException { |
| ModelArchive model = null; |
| |
| @@ -78,7 +96,7 @@ |
| |
| return model; |
| } |
| - |
| + |
| public static ModelArchive getModelArchive(JSONObject metaData) throws JSONException { |
| ModelArchive model = null; |
| String serviceName = metaData.getString(csip.ModelDataService.KEY_SERVICE_URL); |
| @@ -95,7 +113,7 @@ |
| |
| return model; |
| } |
| - |
| + |
| public static ModelArchive getModelArchive(JSONObject metaData, byte[] fileData) throws JSONException, IOException { |
| ModelArchive model = null; |
| String serviceName = metaData.getString(csip.ModelDataService.KEY_SERVICE_URL); |
| @@ -111,5 +129,5 @@ |
| } |
| |
| return model; |
| - } |
| + } |
| } |