Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#1475 -- Regular crawling should work when autodiscovery of sitemaps is turned off #1477

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+34 −3
Open

#1475 -- Regular crawling should work when autodiscovery of sitemaps is turned off #1477

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f61234
#1475 -- if sitemap discovery is turned off, links should be extracted
tballison Feb 21, 2025
79f5188
#1475 -- cleanup
tballison Feb 21, 2025
7cbacda
#1475 -- code style
tballison Feb 21, 2025
8895f97
#1475 -- move logic to SitemapFilter
tballison Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/src/main/java/org/apache/stormcrawler/bolt/FetcherBolt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,9 @@ public void run() {
smautodisco = false;
} else {
smautodisco = sitemapsAutoDiscovery;
// SitemapFilter needs this
metadata.setValue(
SITEMAP_DISCOVERY_PARAM_KEY, Boolean.toString(smautodisco));
}

if (!fromCache && smautodisco) {
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/apache/stormcrawler/bolt/SimpleFetcherBolt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,8 @@ public void execute(Tuple input) {
smautodisco = false;
} else {
smautodisco = sitemapsAutoDiscovery;
// SitemapFilter needs this
metadata.setValue(SITEMAP_DISCOVERY_PARAM_KEY, Boolean.toString(smautodisco));
}

if (!fromCache && smautodisco) {
Expand Down
17 changes: 11 additions & 6 deletions core/src/main/java/org/apache/stormcrawler/filtering/sitemap/SitemapFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,23 @@
*/
public class SitemapFilter extends URLFilter {

private static final String SITEMAP_DISCOVERY_PARAM_KEY = "sitemap.discovery";

@Override
public @Nullable String filter(
@Nullable URL sourceUrl,
@Nullable Metadata sourceMetadata,
@NotNull String urlToFilter) {

if (sourceMetadata != null
&& !Boolean.parseBoolean(
sourceMetadata.getFirstValue(SiteMapParserBolt.isSitemapKey))
&& Boolean.parseBoolean(
sourceMetadata.getFirstValue(SiteMapParserBolt.foundSitemapKey))) {
return null;
if (sourceMetadata != null) {
if (!Boolean.parseBoolean(sourceMetadata.getFirstValue(SITEMAP_DISCOVERY_PARAM_KEY))) {
return urlToFilter;
} else if (!Boolean.parseBoolean(
sourceMetadata.getFirstValue(SiteMapParserBolt.isSitemapKey))
&& Boolean.parseBoolean(
sourceMetadata.getFirstValue(SiteMapParserBolt.foundSitemapKey))) {
return null;
}
}
return urlToFilter;
}
Expand Down