Issues checking improvements

olegshan · olegshan · commit 28c2bf306e23 · 2016-11-30T23:20:25.000+02:00
diff --git a/src/main/java/com/olegshan/parser/siteparsers/DouUaJobParser.java b/src/main/java/com/olegshan/parser/siteparsers/DouUaJobParser.java
@@ -26,7 +26,7 @@ public LocalDateTime getDate(Element job, String url, Elements titleBlock) throw
         String dateLine = dateDoc.getElementsByAttributeValue(
                 jobSite.getDateData()[0],
                 jobSite.getDateData()[1]).text();
-        check(dateLine, "date line");
+        check(dateLine, "date line", url);
         String[] dateParts = dateLine.split(jobSite.getSplit());
         MonthsTools.removeZero(dateParts);
 
diff --git a/src/main/java/com/olegshan/parser/siteparsers/JobsUaJobParser.java b/src/main/java/com/olegshan/parser/siteparsers/JobsUaJobParser.java
@@ -32,7 +32,7 @@ public String getCompany(Element job, String url) throws ParserException {
         Elements companyBlock = jobDoc.getElementsByAttributeValue(companyData[0], companyData[1]);
 
         String company = companyBlock.get(0).getElementsByTag("a").first().text();
-        check(company, "company");
+        check(company, "company", url);
         return company;
     }
 }
diff --git a/src/main/java/com/olegshan/parser/siteparsers/RabotaUaJobParser.java b/src/main/java/com/olegshan/parser/siteparsers/RabotaUaJobParser.java
@@ -31,7 +31,7 @@ public Elements getJobBlocks(Document doc) throws ParserException {
                 jobBlocks.addAll(jobElements);
             }
         }
-        check(jobBlocks, "job blocks");
+        check(jobBlocks, "job blocks", null);
         return jobBlocks;
     }
 
@@ -44,6 +44,20 @@ public String getTitle(Elements titleBlock) {
         return title;
     }
 
+    @Override
+    public String getCompany(Element job, String url) throws ParserException {
+        String company = job.getElementsByAttributeValue(jobSite.getCompanyData()[0], jobSite.getCompanyData()[1]).text();
+        if (company.length() == 0) {
+            company = job.getElementsByAttributeValue("class", "s").text();
+            if (company.startsWith("Анонимный работодатель")) {
+                company = "Анонимный работодатель";
+            } else {
+                check(company, "company", url);
+            }
+        }
+        return company;
+    }
+
     @Override
     public LocalDateTime getDate(Element job, String url, Elements titleBlock) throws ParserException {
         /*
@@ -78,7 +92,6 @@ public LocalDateTime getDate(Element job, String url, Elements titleBlock) throw
             year = Integer.parseInt(dateParts[2]);
             month = Integer.parseInt(dateParts[1]);
             day = Integer.parseInt(dateParts[0]);
-
         } else {
             //for format yyyy-mm-dd
             dateParts = dateLine.split("-");
diff --git a/src/main/java/com/olegshan/parser/siteparsers/WorkUaJobParser.java b/src/main/java/com/olegshan/parser/siteparsers/WorkUaJobParser.java
@@ -20,7 +20,7 @@ public WorkUaJobParser(JobSite jobSite) {
     @Override
     public Elements getJobBlocks(Document doc) throws ParserException {
         Elements jobBlocks = doc.getElementsByAttributeValueStarting(jobSite.getJobBox()[0], jobSite.getJobBox()[1]);
-        check(jobBlocks, "job blocks");
+        check(jobBlocks, "job blocks", null);
         return jobBlocks;
     }
 
@@ -33,7 +33,7 @@ public Elements getTitleBlock(Element job) {
     public LocalDateTime getDate(Element job, String url, Elements titleBlock) throws ParserException {
         String dateLine = titleBlock.attr("title");
         String[] dateParts = dateLine.substring(dateLine.length() - 8).split(jobSite.getSplit());
-        check(dateParts, "date parts");
+        check(dateParts, "date parts", url);
 
         int year = parseInt(dateParts[2]) + 2000;
         int month = parseInt(dateParts[1]);
@@ -47,7 +47,7 @@ public String getCompany(Element job, String url) throws ParserException {
         String[] companyData = jobSite.getCompanyData();
         Document jobDoc = getDoc(url);
         Elements companyBlock = jobDoc.getElementsByAttributeValue(companyData[0], companyData[1]);
-        check(companyBlock, "company block");
+        check(companyBlock, "company block", url);
         return companyBlock.get(0).getElementsByTag("a").text();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public String getCompany(Element job, String url) throws ParserException {`
`32`	`32`	`Elements companyBlock = jobDoc.getElementsByAttributeValue(companyData[0], companyData[1]);`
`33`	`33`
`34`	`34`	`String company = companyBlock.get(0).getElementsByTag("a").first().text();`
`35`		`- check(company, "company");`
	`35`	`+ check(company, "company", url);`
`36`	`36`	`return company;`
`37`	`37`	`}`
`38`	`38`	`}`