Pacote de atualização4

git-svn-id: https://svn.bento.ifrs.edu.br/default/ASES/ASES%20-%20Web/ASES%20-%20Web/Fontes/avaliador-api@10334 c2178572-b5ca-4887-91d2-9e3a90c7d55b

Pacote de atualização4
git-svn-id: https://svn.bento.ifrs.edu.br/default/ASES/ASES%20-%20Web/ASES%20-%20Web/Fontes/avaliador-api@10334 c2178572-b5ca-4887-91d2-9e3a90c7d55b
lyandro.santana
1 parent 874c963d
Showing 2 changed files with 61 additions and 12 deletions Show diff stats
src/main/java/br/com/checker/emag/core/ContentEvaluation.java
src/main/java/br/com/checker/emag/core/MarkEvaluation.java
@@ -171,6 +171,7 @@ public class ContentEvaluation extends Evaluation{
 			Element title = head.getFirstElement("title");
 			if (title == null) {
 				occurrences.add(this.buildOccurrence("3.3", true, "Sem fonte (não existe título na página)", head, "1"));
+				//occurrences.add(new Occurrence("3.3", true, "Sem fonte (não existe título na página)",OccurrenceClassification.CONTENT_INFORMATION,"1"));
 			} else if (title.isEmpty()) {
 				occurrences.add(buildOccurrence("3.3", true, title.toString(), title, "1"));
 			}
@@ -193,7 +194,7 @@ public class ContentEvaluation extends Evaluation{
 			String title = link.getAttributeValue("title");
 			String content = link.getContent().toString();
-			if(hasEqualsContentHref(link) &&isRegistroBr(content))
+			if(hasEqualsContentHref(link) && isRegistroBr(content))
 				occurrences.add(this.buildOccurrence("3.5", false, link.toString(), link, "1"));
 			if(!hasContent(link))
@@ -236,7 +237,7 @@ public class ContentEvaluation extends Evaluation{
 	private boolean isLinkUnavailable(Element link){
-		if(link.getAttributeValue("href") != null && !link.getAttributeValue("href").equals("#") && !link.getAttributeValue("href").contains("javascript")){
+		if(link.getAttributeValue("href") != null && !link.getAttributeValue("href").equals("#") && !link.getAttributeValue("href").equals("/") && !link.getAttributeValue("href").contains("javascript")){
 			int[] codErro ={400, 401,402, 403,404, 405, 406, 407, 408,409, 410, 411, 412, 414,415, 416, 417, 418,422, 423,424,425,426,450,499,500,501,502,503,504,505};
 			int codResponse = 0;
@@ -336,7 +337,12 @@ public class ContentEvaluation extends Evaluation{
 	private boolean hasEqualsContentHref(Element link) {
 		String content = link.getContent().getTextExtractor().toString();
+		if(content != null && !content.isEmpty())
+			content = content.replace("http://","").replaceFirst("(/$)", "");
+		
 		String href = link.getAttributeValue("href");
+		if(href != null && !href.isEmpty())
+			href = href.replace("http://","").replaceFirst("(/$)", "");
 		return content.equals(href);
 	}
@@ -357,18 +363,34 @@ public class ContentEvaluation extends Evaluation{
 	private boolean hasSameContentDiferentLink(Element link) {
 		String content = link.getContent().getTextExtractor().toString();
+		
+		if(content != null)
+			content = content.replace("http://","").replaceFirst("(/$)", "");
+		
 		String href = link.getAttributeValue("href");
+		
+		if(href != null)
+			href = href.replace("http://","").replaceFirst("(/$)", "");
+		
 		if(StringUtils.isBlank(href)) return  false;
 		String otherContent;
 		String otherHref;
 		List<String> linksVerificados = new ArrayList<String>();
-		for(Element otherLink:getDocument().getAllElements("a")){
+		for(Element otherLink : getDocument().getAllElements("a")){
 			if(otherLink.getBegin() == link.getBegin()) continue;
 			otherContent = otherLink.getContent().getTextExtractor().toString();
+			
+			if(otherContent != null)
+				otherContent = otherContent.replace("http://","").replaceFirst("(/$)", "");
+			
 			otherHref = otherLink.getAttributeValue("href");
+			
+			if(otherHref != null)
+				otherHref = otherHref.replace("http://","").replaceFirst("(/$)", "");
+			
 			if(StringUtils.isBlank(otherHref))continue;
 			if(!linksVerificados.contains(content))
 			if(content.toLowerCase().equals(otherContent.toLowerCase()) && !href.equals(otherHref)){ 
@@ -499,10 +521,10 @@ public class ContentEvaluation extends Evaluation{
 			Attribute summary = table.getAttributes().get("summary");
 			if (summary == null || summary.getValue().equals("")) 
-				occurrences.add(buildOccurrence("3.9", false, table.toString(), table, "1"));
+				occurrences.add(buildOccurrence("3.9", false, table.getStartTag().toString()+"</table>", table, "1"));
 			if(table.getAllElements("caption").isEmpty() || table.getAllElements("caption") == null)
-				occurrences.add(buildOccurrence("3.9", false, table.toString(), table, "1"));
+				occurrences.add(buildOccurrence("3.9", false, table.getStartTag().toString()+"</table>", table, "1"));
 		}
 		return occurrences;
@@ -518,7 +540,7 @@ public class ContentEvaluation extends Evaluation{
 		for (Element table : getDocument().getAllElements("table")) {
 			for(Element caption : table.getAllElements("caption")){
 				if(caption == null || caption.isEmpty())
-					occurrences.add(buildOccurrence("3.10", true, table.toString(), table, "1"));
+					occurrences.add(buildOccurrence("3.10", true, table.getStartTag().toString()+"</table>", table, "1"));
 			}
 		}
@@ -538,7 +560,7 @@ public class ContentEvaluation extends Evaluation{
 			if (summary == null || summary.getValue().equals("")) 
-				occurrences.add(buildOccurrence("3.10", true, table.toString(), table, "1"));
+				occurrences.add(buildOccurrence("3.10", true, table.getStartTag().toString()+"</table>", table, "1"));
 			for (Element thead : table.getAllElements("thead")) {
 				if (thead != null)
@@ -177,8 +177,25 @@ public class MarkEvaluation extends Evaluation {
 		List<String> tags = Arrays.asList("h1","h2","h3","h4","h5","h6","a","p");
+			for (String tag : tags) {
+				for (Element element : getDocument().getAllElements(tag)) {
+					if(element.getAttributes().getCount()==0)
+						occurrences.add(this.buildOccurrence("1.2", true, element.toString(), element, "1"));
+					else if(element.getTextExtractor().toString().isEmpty())
+						occurrences.add(this.buildOccurrence("1.2", false, element.toString(), element, "1"));
+				}
+				
+			}
+		
+			//Sorting
+			Collections.sort(occurrences, new Comparator<Occurrence>() {
+			    public int compare(Occurrence  occurrence1, Occurrence  occurrence2){
+		            return  occurrence1.getLine().compareTo(occurrence2.getLine());
+		        }
+		    });
-			boolean isError = false;
+		
+			/*boolean isError = false;
 			for (Element element : getDocument().getAllElements()) {
 				Attributes attribute = element.getAttributes();
@@ -189,7 +206,7 @@ public class MarkEvaluation extends Evaluation {
 					occurrences.add(this.buildOccurrence("1.2", isError, element.toString(), element, "1"));
 				else if(attribute.getCount()==0)
 					occurrences.add(this.buildOccurrence("1.2", isError, element.toString(), element, "1"));
-			}
+			}*/
@@ -242,7 +259,17 @@ public class MarkEvaluation extends Evaluation {
 		}
 		if(!hasH())
-			occurrences.add(this.buildOccurrence("1.3", true,"Sem fonte (os nÃveis de tÃtulo nÃ£o foram utilizados)", getDocument().getFirstElement(), "1"));
+			occurrences.add(this.buildOccurrence("1.3", true,"Sem fonte (os níveis de título não foram utilizados)", getDocument().getFirstElement(), "1"));
+		
+		
+		
+		//Sorting
+		Collections.sort(occurrences, new Comparator<Occurrence>() {
+		    public int compare(Occurrence  occurrence1, Occurrence  occurrence2){
+	            return  occurrence1.getLine().compareTo(occurrence2.getLine());
+	        }
+	    });
+		
 		return occurrences;
 	}
@@ -438,12 +465,12 @@ public class MarkEvaluation extends Evaluation {
 		List<Occurrence> occurrences = new ArrayList<Occurrence>();
 		for (Element table : getDocument().getAllElements("table"))
-			occurrences.add(this.buildOccurrence("1.6", false, table.toString(), table, "1"));
+			occurrences.add(this.buildOccurrence("1.6", false, table.getStartTag()+"</table>", table, "1"));
 		for (Element table : getDocument().getAllElements("table")){
 			Element tagsForm = table.getFirstElement("form");
 			if(tagsForm != null)
-				occurrences.add(this.buildOccurrence("1.6", true, table.toString(), table, "2"));
+				occurrences.add(this.buildOccurrence("1.6", true, table.getStartTag()+"</table>", table, "2"));
 		}
 		return occurrences;