diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/URLCharityScraper.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/URLCharityScraper.java index 9b64342..75709ec 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/URLCharityScraper.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/URLCharityScraper.java @@ -23,43 +23,37 @@ public URLCharityScraper() { options.addArguments("--disable-dev-shm-usage"); } - public boolean updateDescription() { + public String updateDescription(String url) { WebDriver driver = new ChromeDriver(options); WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(30)); - StringBuilder descriptionString = new StringBuilder(); + StringBuilder descriptionString = new StringBuilder(); try { - // URL for scraping approved organizations - driver.get("https://www.innsamlingskontrollen.no/organisasjoner/anna-ministries/"); + driver.get(url); wait.until( ExpectedConditions.numberOfElementsToBeMoreThan(By.cssSelector(".information div"), 0)); + // Check for if description is long and contains a "read more" link + List doesReadMoreExist = driver.findElements(By.cssSelector("a.read-more")); + + if (!doesReadMoreExist.isEmpty()) { + WebElement descReadMore = driver.findElement(By.cssSelector("a.read-more")); + descReadMore.click(); + wait.until(ExpectedConditions.visibilityOfElementLocated(By.cssSelector(".extra-info"))); + } + List description = driver.findElements(By.cssSelector(".information div")); for (WebElement element : description) { descriptionString.append(element.getText()); } - // Check for if description is long and contains a "read more" link - List doesReadMoreExist = driver.findElements(By.cssSelector("a.read-more")); - - if (!doesReadMoreExist.isEmpty()) { - WebElement descReadMore = driver.findElement(By.cssSelector("a.read-more")); - descReadMore.click(); - wait.until(ExpectedConditions.visibilityOfElementLocated(By.cssSelector(".extra-info"))); - - List extraDescription = driver.findElements(By.cssSelector(".extra-info")); - - for (WebElement webElement : extraDescription) { - descriptionString.append(webElement.getText()); - } - } - } finally { driver.quit(); } - return true; + + return descriptionString.toString(); } public boolean updateLogo() {