Skip to content
Snippets Groups Projects
Commit fd1c94f4 authored by bourgesl's avatar bourgesl
Browse files

ignore orphan projects in generate Embedded pages

parent e4a89956
No related branches found
No related tags found
No related merge requests found
......@@ -152,38 +152,42 @@ public final class GenerateRedirectPipeline extends AbstractPipeline<PipelineCom
for (Project p : projects) {
final String projectName = p.getName();
final ProjectConfig projectConfig = pipeData.getProjectConfigAll(projectName);
if (projectConfig.getPropertyBoolean(ProjectConfig.CONF_KEY_GENERATE_EMBEDDED)) {
// // [public/staging]/PROJECT/embed/DOI_SUFFIX[.html]
sb.append("\n# Project ").append(projectName);
/*
RedirectMatch "^/embed/AMMA-CATCH.CE.RainD_Nc([-]*)(.*)" "/staging/AMMA-CATCH/embed/AMMA-CATCH.CE.RainD_Nc$1$2.html"
/embed/AMMA-CATCH.CE.RainD_Nc => /staging/AMMA-CATCH/embed/AMMA-CATCH.CE.RainD_Nc.html
/embed/AMMA-CATCH.CE.RainD_Nc-header => /staging/AMMA-CATCH/embed/AMMA-CATCH.CE.RainD_Nc-header.html
/embed/AMMA-CATCH.CE.RainD_Nc-meta => /staging/AMMA-CATCH/embed/AMMA-CATCH.CE.RainD_Nc-meta.html
*/
final List<Doi> dois = dr.findByProject(projectName);
logger.info("Dois for project[{}]: {}", projectName, dois.size());
for (Doi doi : dois) {
final String doiSuffix = doi.getIdentifier();
// ^/embed/
sb.append("\nRedirectMatch \"^/").append(Paths.DIR_WEB_EMBED).append('/');
sb.append(doiSuffix).append("([-]*)(.*)\" \"");
final List<Doi> dois = dr.findByProject(projectName);
if (doi.getStatus() == Status.PUBLIC) {
sb.append('/').append(Paths.DIR_WEB_PUBLIC).append('/');
} else {
sb.append('/').append(Paths.DIR_WEB_STAGING).append('/');
logger.info("Dois for project[{}]: {}", projectName, dois.size());
// skip empty projects (orphans)
if (!dois.isEmpty()) {
final ProjectConfig projectConfig = pipeData.getProjectConfigAll(projectName);
if (projectConfig.getPropertyBoolean(ProjectConfig.CONF_KEY_GENERATE_EMBEDDED)) {
// // [public/staging]/PROJECT/embed/DOI_SUFFIX[.html]
sb.append("\n# Project ").append(projectName);
/*
RedirectMatch "^/embed/AMMA-CATCH.CE.RainD_Nc([-]*)(.*)" "/staging/AMMA-CATCH/embed/AMMA-CATCH.CE.RainD_Nc$1$2.html"
/embed/AMMA-CATCH.CE.RainD_Nc => /staging/AMMA-CATCH/embed/AMMA-CATCH.CE.RainD_Nc.html
/embed/AMMA-CATCH.CE.RainD_Nc-header => /staging/AMMA-CATCH/embed/AMMA-CATCH.CE.RainD_Nc-header.html
/embed/AMMA-CATCH.CE.RainD_Nc-meta => /staging/AMMA-CATCH/embed/AMMA-CATCH.CE.RainD_Nc-meta.html
*/
for (Doi doi : dois) {
final String doiSuffix = doi.getIdentifier();
// ^/embed/
sb.append("\nRedirectMatch \"^/").append(Paths.DIR_WEB_EMBED).append('/');
sb.append(doiSuffix).append("([-]*)(.*)\" \"");
if (doi.getStatus() == Status.PUBLIC) {
sb.append('/').append(Paths.DIR_WEB_PUBLIC).append('/');
} else {
sb.append('/').append(Paths.DIR_WEB_STAGING).append('/');
}
sb.append(projectName).append('/').append(Paths.DIR_WEB_EMBED).append('/').append(doiSuffix);
sb.append("$1$2").append(GeneratePipeline.HTML_EXT).append('\"');
}
sb.append(projectName).append('/').append(Paths.DIR_WEB_EMBED).append('/').append(doiSuffix);
sb.append("$1$2").append(GeneratePipeline.HTML_EXT).append('\"');
sb.append('\n');
}
sb.append('\n');
}
}
sb.append('\n');
......
......@@ -180,7 +180,7 @@ public final class FileUtils {
if (dir != null) {
return dir;
}
throw new FileNotFoundException("Invalid directory '" + ((dir == null) ? null : dir.getAbsolutePath()) + "' !");
throw new FileNotFoundException("Invalid directory '" + ((dir == null) ? path : dir.getAbsolutePath()) + "' !");
}
/**
......@@ -240,7 +240,7 @@ public final class FileUtils {
if (file != null) {
return file;
}
throw new FileNotFoundException("Invalid file '" + ((file == null) ? null : file.getAbsolutePath()) + "' !");
throw new FileNotFoundException("Invalid file '" + ((file == null) ? path : file.getAbsolutePath()) + "' !");
}
// writers :
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment