diff --git a/engine/src/main/resources/org/archive/crawler/restlet/Beans.ftl b/engine/src/main/resources/org/archive/crawler/restlet/Beans.ftl index 7703ebde..cd74c3b8 100644 --- a/engine/src/main/resources/org/archive/crawler/restlet/Beans.ftl +++ b/engine/src/main/resources/org/archive/crawler/restlet/Beans.ftl @@ -63,7 +63,7 @@ <#if bean.propValuePreviouslyDescribed??> ↑ -<#elseif !bean.propValue?? && !bean.properties??> +<#elseif !bean.propValue?? && !bean.properties?? && !bean.get("class")??> <#if bean.key?? && bean.field??> ${bean.key} <#else> @@ -79,7 +79,7 @@ -<#if bean.properties?? || (bean.propValue?? && bean.propValue?is_collection)> +<#if (!bean.propValue?? && !bean.properties?? && bean.get("class")??) || bean.properties?? || (bean.propValue?? && bean.propValue?is_collection)>
${bean.get("class")} diff --git a/engine/src/main/resources/org/archive/crawler/restlet/Job.ftl b/engine/src/main/resources/org/archive/crawler/restlet/Job.ftl index bed99c1c..d5c3095c 100644 --- a/engine/src/main/resources/org/archive/crawler/restlet/Job.ftl +++ b/engine/src/main/resources/org/archive/crawler/restlet/Job.ftl @@ -166,18 +166,18 @@ ${line?html}

Files

Browser Job Directory

Configuration-referenced Paths

- <#assign refPaths=job.referen! /> - <#if !refPaths?has_content > + <#assign configRefPaths=job.configFiles! /> + <#if !configRefPaths?has_content > build the job to discover referenced paths <#else>
- <#list refPaths as config> + <#list configRefPaths as config>
${config.key}: ${config.name}
<#if config.path??> - ${config.path.absolutePath}<#if config.editable> [edit] + ${config.path}<#if config.editable> [edit] <#else> unset diff --git a/engine/src/main/resources/org/archive/crawler/restlet/Script.ftl b/engine/src/main/resources/org/archive/crawler/restlet/Script.ftl index 8e437c83..3d95a886 100644 --- a/engine/src/main/resources/org/archive/crawler/restlet/Script.ftl +++ b/engine/src/main/resources/org/archive/crawler/restlet/Script.ftl @@ -44,9 +44,7 @@ selected='selected' value='${scriptEngine.engine}'>${scriptEngine.language} - + The script will be executed in an engine preloaded