Skip to content
This repository was archived by the owner on Jan 21, 2021. It is now read-only.

Commit ad54d13

Browse files
author
James Maina
committed
Fix: Build errors
1 parent 78cc42d commit ad54d13

3 files changed

Lines changed: 54 additions & 58 deletions

File tree

‎opensrp-core/src/main/java/org/opensrp/service/XlsFormDownloaderService.java‎

Lines changed: 51 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,16 @@
22

33

44

5-
import httpdowload.JustForFun;
6-
75
import java.io.IOException;
86
import java.io.StringReader;
97
import java.io.StringWriter;
108
import java.io.Writer;
11-
import java.util.Arrays;
12-
import java.util.Date;
139

1410
import javax.xml.parsers.DocumentBuilder;
1511
import javax.xml.parsers.DocumentBuilderFactory;
1612
import javax.xml.parsers.ParserConfigurationException;
1713

18-
import org.apache.commons.lang3.ArrayUtils;
1914
import org.codehaus.jackson.JsonProcessingException;
20-
import org.joda.time.DateTime;
21-
import org.joda.time.Hours;
22-
import org.joda.time.Years;
2315
import org.opensrp.util.FileCreator;
2416
import org.opensrp.util.JsonParser;
2517
import org.opensrp.util.NetClientGet;
@@ -33,39 +25,40 @@
3325

3426
import com.sun.org.apache.xml.internal.serialize.OutputFormat;
3527
import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
36-
import com.sun.xml.internal.txw2.Document;
28+
29+
//import httpdowload.JustForFun;
3730

3831
/**
3932
* @author muhammad.ahmed@ihsinformatics.com
4033
* Created on 17-September, 2015
4134
*/
4235
@Service
4336
public class XlsFormDownloaderService {
44-
private NetClientGet netClientGet;
45-
private FileCreator fileCreator;
46-
private JsonParser jsonParser;
47-
48-
private byte[] formJson=null;
49-
public XlsFormDownloaderService() {
50-
netClientGet=new NetClientGet();
51-
fileCreator=new FileCreator();
52-
53-
jsonParser=new JsonParser();
54-
}
37+
// private NetClientGet netClientGet;
38+
// private FileCreator fileCreator;
39+
// private JsonParser jsonParser;
40+
//
41+
// private byte[] formJson=null;
42+
// public XlsFormDownloaderService() {
43+
// netClientGet=new NetClientGet();
44+
// fileCreator=new FileCreator();
45+
//
46+
// jsonParser=new JsonParser();
47+
// }
5548

5649
public static void main(String[] args) {
57-
try {
58-
new XlsFormDownloaderService().downloadFormFiles("D:\\opensrpVaccinatorWkspc\\forms",
59-
"maimoonak", "opensrp", JustForFun.Form, "child_vaccination_enrollment", "135187");
60-
//-------------------------
61-
new XlsFormDownloaderService().downloadFormFiles("D:\\opensrpVaccinatorWkspc\\forms",
62-
"maimoonak", "opensrp", JustForFun.Form, "child_vaccination_followup", "135199");
63-
//---------------------------
64-
new XlsFormDownloaderService().downloadFormFiles("D:\\opensrpVaccinatorWkspc\\forms",
65-
"maimoonak", "opensrp", JustForFun.Form, "woman_tt_enrollement_form", "135200");
66-
//----------------------------
67-
new XlsFormDownloaderService().downloadFormFiles("D:\\opensrpVaccinatorWkspc\\forms",
68-
"maimoonak", "opensrp", JustForFun.Form, "woman_tt_followup_form", "135203");
50+
// try {
51+
// new XlsFormDownloaderService().downloadFormFiles("D:\\opensrpVaccinatorWkspc\\forms",
52+
// "maimoonak", "opensrp", JustForFun.Form, "child_vaccination_enrollment", "135187");
53+
// //-------------------------
54+
// new XlsFormDownloaderService().downloadFormFiles("D:\\opensrpVaccinatorWkspc\\forms",
55+
// "maimoonak", "opensrp", JustForFun.Form, "child_vaccination_followup", "135199");
56+
// //---------------------------
57+
// new XlsFormDownloaderService().downloadFormFiles("D:\\opensrpVaccinatorWkspc\\forms",
58+
// "maimoonak", "opensrp", JustForFun.Form, "woman_tt_enrollement_form", "135200");
59+
// //----------------------------
60+
// new XlsFormDownloaderService().downloadFormFiles("D:\\opensrpVaccinatorWkspc\\forms",
61+
// "maimoonak", "opensrp", JustForFun.Form, "woman_tt_followup_form", "135203");
6962

7063
/*new XlsFormDownloaderService().downloadFormFiles("D:\\opensrpVaccinatorWkspc\\forms",
7164
"maimoonak", "opensrp", JustForFun.Form, "vaccine_stock_position", "115142");
@@ -77,9 +70,9 @@ public static void main(String[] args) {
7770
7871
new XlsFormDownloaderService().downloadFormFiles("D:\\opensrpVaccinatorWkspc\\forms",
7972
"maimoonak", "opensrp", JustForFun.Form, "offsite_woman_followup_form", "115135");*/
80-
} catch (IOException e) {
81-
e.printStackTrace();
82-
}
73+
// } catch (IOException e) {
74+
// e.printStackTrace();
75+
// }
8376
}
8477

8578
public String formatXML(String input)
@@ -144,30 +137,32 @@ private org.w3c.dom.Document parseXmlFile(String in) {
144137

145138
public boolean downloadFormFiles(String directory,String username ,String formPath, String password,String formId, String formPk) throws IOException{
146139

147-
String xmlData=netClientGet.convertToString("", formPath, formId);
148-
String modelData=netClientGet.getModel(xmlData);
149-
String formData=fileCreator.prettyFormat(netClientGet.getForm(xmlData));
150-
151-
modelData=format(modelData);
152-
153-
formData = formData.replaceAll("selected\\(", "contains(");
154-
formData = formData.replaceAll("<span.*lang=\"openmrs_code\".*</span>", "");
155-
formData = formData.replaceAll("<option value=\"openmrs_code\">openmrs_code</option>", "");
156-
157-
formJson=netClientGet.downloadJson(username,password, formPk);
158-
159-
//formData=fileCreator.prettyFormat(formData);
160-
System.out.println(getFormDefinition());
161-
fileCreator.createFile("form_definition.json", fileCreator.osDirectorySet(directory)+formId, getFormDefinition().getBytes());
162-
return fileCreator.createFormFiles(fileCreator.osDirectorySet(directory)+formId, formId, formData.getBytes(), modelData.getBytes(), formJson);
140+
// String xmlData=netClientGet.convertToString("", formPath, formId);
141+
// String modelData=netClientGet.getModel(xmlData);
142+
// String formData=fileCreator.prettyFormat(netClientGet.getForm(xmlData));
143+
//
144+
// modelData=format(modelData);
145+
//
146+
// formData = formData.replaceAll("selected\\(", "contains(");
147+
// formData = formData.replaceAll("<span.*lang=\"openmrs_code\".*</span>", "");
148+
// formData = formData.replaceAll("<option value=\"openmrs_code\">openmrs_code</option>", "");
149+
//
150+
// formJson=netClientGet.downloadJson(username,password, formPk);
151+
//
152+
// //formData=fileCreator.prettyFormat(formData);
153+
// System.out.println(getFormDefinition());
154+
// fileCreator.createFile("form_definition.json", fileCreator.osDirectorySet(directory)+formId, getFormDefinition().getBytes());
155+
// return fileCreator.createFormFiles(fileCreator.osDirectorySet(directory)+formId, formId, formData.getBytes(), modelData.getBytes(), formJson);
156+
return false;
163157
}
164158

165159
public String getFormDefinition() throws JsonProcessingException, IOException{
166-
if(formJson==null){
167-
return "Data not found on server . Please retry again !";
168-
169-
}
170-
return jsonParser.getFormDefinition(formJson);
160+
// if(formJson==null){
161+
// return "Data not found on server . Please retry again !";
162+
//
163+
// }
164+
// return jsonParser.getFormDefinition(formJson);
165+
return null;
171166

172167
}
173168
}

‎opensrp-web/src/main/java/org/opensrp/web/controller/FormSubmissionController.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import java.util.List;
1414
import java.util.Map;
1515

16+
import org.joda.time.DateTime;
1617
import org.json.JSONException;
1718
import org.json.JSONObject;
1819
import org.opensrp.common.AllConstants;
@@ -139,7 +140,7 @@ public FormSubmission convert(FormSubmissionDTO submission) {
139140
}
140141
catch(Exception e){
141142
e.printStackTrace();
142-
ErrorTrace errorTrace=new ErrorTrace(new Date(), "Parse Exception", "", e.getStackTrace().toString(), "Unsolved", formSubmission.formName());
143+
ErrorTrace errorTrace=new ErrorTrace(new DateTime(), "Parse Exception", "", e.getStackTrace().toString(), "Unsolved", formSubmission.formName());
143144
errorTrace.setRecordId(formSubmission.instanceId());
144145
errorTraceService.addError(errorTrace);
145146
}

‎opensrp-web/src/main/java/org/opensrp/web/listener/ApplicationStartupListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void onApplicationEvent(ContextRefreshedEvent contextRefreshedEvent) {
4747
scheduler.startJob(formSchedule);
4848
//scheduler.startJob(anmReportScheduler);
4949
//scheduler.startJob(mctsReportScheduler);
50-
scheduler.startJob(openmrsScheduleSyncerScheduler);
50+
// scheduler.startJob(openmrsScheduleSyncerScheduler);
5151
scheduler.startJob(atomfeedSchedule);
5252
scheduler.startJob(encounterSchedule);
5353

0 commit comments

Comments
 (0)