From 3a3c646ae84a6919afdf7fa5c88e6b487d663779 Mon Sep 17 00:00:00 2001
From: Damian Panasiuk <pd36868@zut.edu.pl>
Date: Fri, 26 Feb 2021 15:11:30 +0100
Subject: [PATCH] Bad detect is word in dictionary
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixed a bug when "nie występuje w słowniku" was in comment section.
In this case to regex is input from <h1 tag , to KOMENTARZE: .
It means: from tag where is name of word to commentary section
---
 library/SjpApi.jar        | Bin 256062 -> 256039 bytes
 src/CurlHelper.java       |   6 +-----
 src/CurlWrapper.java      |  14 +++++++-------
 src/StringUtils.java      |   5 +++--
 test/CurlWrapperTest.java |  10 ++++------
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/library/SjpApi.jar b/library/SjpApi.jar
index b373da1d55f40b042488d744daf26b5cf1c59be2..ef8a266cb94709c30c8bb9d53f55b90d5231205c 100644
GIT binary patch
delta 1882
zcmaKtYgANK6vzMPo`Jax0}Kb5aTp%r3mH*_%#;CSP())u^AVz@5+YbRs10G6j%KDk
z)asf?DasyZDHS?7YA$<xHrKLGeP~tktW{t7)CX#1`_6Do*J?Fu%{jlb@7epm_r7P{
z^Tmy{(>K!k{$xqT#Rv6W3Baz1MH}I{Ic=?>>ef)Gt2MZ|#2?(apkvFH)?jEwYfETz
zM=)|LLC;M3vgwSwk^_~7!!z3a{~iqPj?U25&i@L^klJ1{7I{Ued3%T<<8Hl})!2|-
zBzSpy2}5$-()yZ)mHy>xYRV!#*@<~c>(=LAD02X1Mz60hJk^E{^yqlY1|4tfIBCxB
zBq4}*ZE)f}E8e%_lnqJfF^3P#$EQvD&_;VcGM8s`oVB4BAM5zUhELIF4(Dt*kBAkY
znNcYI1szcnFY36Y<Fby=bzIS5EGz#l(aMso%pR$)h-fUuU{zQ1Lg-{*Q|&C3r4jh-
z%)!#_*otj-CRm2?L)FZJaV*m`JMGNH#@n$I&zRfY3<;}NE}Ajd%ChXt!?F#(-<OeN
zXSpoTj^k{CmF3&nL^jDd;?L)k*_24cf0;*i*3`2}L23oSU^9hi-cBnGPau()GNSQG
zqmMZYy2x(YKyBDTqdmq6cnVL`%5A0++dHi`#JY^0T3^`QRY^XRQGs394GT&z3t^%J
zWFmk)*b6!yXu-2&Gk-1EM>a<7U5n?4H0&oUss4p#Iw5!-2TTpJb&@BYM!3Awqe!dt
z7STAz;?2plM3GSE?W0Fw4Q9@Qbb&^SvKlF9BIUKQ{Ab7gad1rAg%^m-`doOCNF$GQ
zycEkZg}U=Hk%e+Ngv0dA%%Oy4bHCLq9G8%8YQ`nwZ3;Kv(I+d8#B^SvO&0QcmAd#E
zjInCk$kEI)Lx{liOUS4%@<uVPVMY|0y|<&r3u&doH&KJykc#%0fH&@nqcH&v2VRdA
z64sH7V~`X(m1;eX6XdF+JN`~7*WOt7!G^BD*>n-E2oldDQH&SvD6$$&^oVSQIYLvI
zEAkXh5cvuxib)D5iz$TRScs{jK$)kBLWN#IuPv@oB&f_d&J@K8XNeMprQ#liv&Fp%
z=ZO0h&K2_%mI<H2^025-Tq))&tP*~O)nb9dg`!5`B2lYwu~?$;eo?0|AnFx1h@}db
zi3b!e7b{E*n;l#!Rw?s?qEX>$(WG#VSgY_M@vy>mV!gr*qFLc1qDA3G(W-EhXj9lO
zHY<EoxE@pdxY%OiIXX%VT}H6(s`ZW7v3he~Y2ZL<fYD#OSQ_9xN43AN$!~9RKd<*N
zx!1$S%NhOL%MQxb{k&XDE|kam`9dwlF4KqkIQe@&cm8`b$g~08sD0x!esbo>YXjUN
zzt3ZiWKtUYMP=UruVF3nj{#oI&dPa%yo#S_XYzVGbIYcm$>Y=@&tetwt3h6nef$2P
zkAz#rh|QWu@*#?}LoONOeyuCl*q!T?-wjd#eGb1<a!_6$BCV6sG0bZ<PrzshIAzB$
zm9$=VlZjd6z%XCPe=TG(*UMb8YJ@woZ{HSlW8AHL#%G-KdE|i+zD>KeUyhFOY98oj
sa!)tQGAr=%L!+AfdQ{7hCupTj%QuSi-SS6b7LrN7@Z!Y7H_eaUKl)mtEdT%j

delta 1902
zcmZvd>vK~@6u{59o95o8*EZcWeI=pv-KIrogo?J52B9DgFDaCVD5XtHm9_{$ET}<I
zPyrDxu!16}Aflj!Xn8Xu`cWOm?~e2V{SOq889ke@6lP53?*8`ddGAg3#PzhR*VFp`
z!PK$t_17Xv0P@KOkuu0~trhvnu}bYKb7!=L*MuYCS>cwphIKt%^EO1*ZivJTyWvir
zja6EJ0R*fZ&z;5ptB8=@6SrvYjI1V-ZWe}HBb`0n2+mbKZN2wa3nMM-A`goiI=eg9
zTM=(%y1iCv)*<M%<Kq-N>$T@4|DN&N#&#z_yY)j&d9>02FToK5jyk}APYw7?&Yvg4
zS~%vQvX1NUg$^eikPJuU@TJ^7Dd{T*>3l7hr{r+jfNu==)&YHR#(=X9h{1Pq_}&5i
za88Hw(i_FOV8BI*mkhXUz!j^jc7z+4VxVc@BL=4Gn5LsMwromF!*naP{z~4<un_@E
zOyuYys4+1E-6pJq^(JOw*4}it^>2MnbvEY6om>+==r!RrcwJifOdNxGqb)#4TGZ4q
zZnBPJP0YsvYih8@RcK-n7MpMgOLQzXu?)+tUBP_j$BNjQ;02aqUlZ=`h^$6nWwG`d
z3$So4H4Om4A=98aLMsh6fSs7~rSTQ3r6{wsm*i3g)UZu7nsH8o&G0I%a%7fq-K?1r
z?6r2ztcgmkI<hH(DG-G%V1p`{0B;Z_fg3{bCTs<Id7u^EBANWO!rLT6I)mk~jYxy-
zB&Dc#p#>?%JMgZIL9)$cNiQq-{1yF>Mvrr4ou8)@SKItPx2+$NqK*DO($GL=&M7*;
zVn~5zaKRGrz_NH16BAzGy?Yt>U<Z+`(g!<<G_v5ZE1s!~dh|Y#jWXE{AJCr6q>5&#
zulqSa53bRW(L}daKF}>4_Qd1tC4C!NS=7sYu>W379puSIJ1(9PsyGksIhFo?$ecT_
zAF@u7_`yQjsQfUssU1?GBObt?Fogs001TWE6@;>vDexg2B=c0N^$>hSrUrbRI9c*~
zDt-ol!<Qg?={d-Wf&DDlc`o<#gST0tkB?E9$2EmxdA`B|UZ}8$7b}dG@KVKPyj-E5
z(`h9fS8}Q?fsgX>3McR?g#rGU!ijv6!fO7w!pZyzg-`Mtg|&PNVKkn69iOVi^*pF>
z8h=XRbUs621D~mI7JpjdY~H9a#OElS%jYSa&lf0shA&ju6y=K)FXqh(m+++um+|Ea
zpXDnQKF6O|xRSRhT*X@zw(+pScHW_IHSbjT0)J7WPoCWx-lfFdyhq|0dX*4*t>(rn
z`r-I%^~qLGXuBtb^l0ZiA$EA5=Kfh+yupIlChp!~)A5K14zOD7&oU7mpruXxG{7p7
z@825Y_5f?fAI1DZHVc0d2M5^<+$8=OWYh4PC>Ub(*e6<tNZ2G!4zW`2{cD4M{W+Av
z=;!ZTYmCPu4h}G<$Qow3xLX8<DUVemLKC|)i5;kBnc~-B=GTO7UDmzguR-Rt%0teS
zQ7-`zyvc&v>|$$ku~!_u$^6Vyj3U1nvlFgwm!s1h)knWbzs1Tt_pcMWQXbB0zi7I}
zc4?X0#Lz9Os#TPXum(IPx<=Skbcxd=Y&zQ!U}8^z`7-A>CfTKPFMYS_0LO30f4Tnv
D^m&{8

diff --git a/src/CurlHelper.java b/src/CurlHelper.java
index 36d46ce..9fd86cb 100644
--- a/src/CurlHelper.java
+++ b/src/CurlHelper.java
@@ -1,10 +1,6 @@
 package com.sjp.sjpapi;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
 
 public class CurlHelper {
 
@@ -20,7 +16,7 @@ public static String getOutputFromCurl(String word) throws IOException {
         String outputFromCurl = readCurlFromSJP(word);
 
         if (validator.isCurlValidate(outputFromCurl) == true) {
-            return wrapper.deleteHeadFromOutput(outputFromCurl);
+            return wrapper.getBettwenH1AndCommentSection(outputFromCurl);
         }
         return "";
     }
diff --git a/src/CurlWrapper.java b/src/CurlWrapper.java
index fc9f27f..bfb3fe6 100644
--- a/src/CurlWrapper.java
+++ b/src/CurlWrapper.java
@@ -3,18 +3,18 @@
 public class CurlWrapper {
 
     public String wrappCurl(String curlOutput) {
-        return deleteHeadFromOutput(curlOutput);
+        return getBettwenH1AndCommentSection(curlOutput);
     }
 
-    public String deleteHeadFromOutput(String curlOutput) {
+    public String getBettwenH1AndCommentSection(String curlOutput) {
 
-        String outputWithoutHeadSection = curlOutput;
+        String outputBettwenH1AndComment = curlOutput;
 
-        String bodySectionStart = "<body>";
-        String bodySectionFinis = "</body>";
-        outputWithoutHeadSection = StringUtils.substringBettwen(outputWithoutHeadSection,bodySectionStart,bodySectionFinis);
+        String h1SectionStart = "<h1";
+        String CommentSectionStart = "KOMENTARZE:";
+        outputBettwenH1AndComment = StringUtils.substringBettwen(outputBettwenH1AndComment,h1SectionStart,CommentSectionStart);
 
-        return outputWithoutHeadSection;
+        return outputBettwenH1AndComment;
     }
 
 
diff --git a/src/StringUtils.java b/src/StringUtils.java
index 0480a22..da83c7c 100644
--- a/src/StringUtils.java
+++ b/src/StringUtils.java
@@ -84,8 +84,9 @@ public static final String unescapeHTML(String source, int start) {
 
     public static final String substringBettwen(String substringString, String openingSequence, String closingSequence) {
 
-        int startSection = substringString.indexOf(openingSequence) + openingSequence.length();
-        int finisSection = substringString.indexOf("</body>");
+        //int startSection = substringString.indexOf(openingSequence) + openingSequence.length();
+        int startSection = substringString.indexOf(openingSequence);
+        int finisSection = substringString.indexOf(closingSequence);
         substringString = substringString.substring(startSection, finisSection);
 
         return substringString;
diff --git a/test/CurlWrapperTest.java b/test/CurlWrapperTest.java
index e2f792d..8bf4927 100644
--- a/test/CurlWrapperTest.java
+++ b/test/CurlWrapperTest.java
@@ -1,17 +1,15 @@
-package sjpAPI;
+package com.sjp;
 
 import junit.framework.TestCase;
 
-import org.junit.Assert;
-
 public class CurlWrapperTest extends TestCase {
 
     private CurlWrapper wrapper = new CurlWrapper();
 
-    public void testIsNOTHeadInOutput() {
-        String mockCurl = "<head>asdasdsadasd</head> <body>fgdfggfhtyjfhghfgd</body> asfdfhtyhhjdffsdc";
+    public void testIsBettwenH1AndCommentSection() {
+        String mockCurl = "<head>asdasdsadasd</head> <body><h1>fgdfggfhtyjfhghfgd</h1>KOMENTARZE:</body> asfdfhtyhhjdffsdc";
         mockCurl = wrapper.wrappCurl(mockCurl);
-        assertEquals(mockCurl,"fgdfggfhtyjfhghfgd");
+        assertEquals(mockCurl,"<h1>fgdfggfhtyjfhghfgd</h1>");
 
     }
 }
\ No newline at end of file