From 2f4d4377349f83d4d72c0ddfe3c5abc5c9b600ce Mon Sep 17 00:00:00 2001
From: Adam Miller <adam.spokane@gmail.com>
Date: Fri, 15 Mar 2013 16:06:06 -0700
Subject: [PATCH] Beans.ftl 	Fixed a bug that showed objects with no
 properties as null instead of displaying the class name Job.ftl 	Fixed
 a bug that prevented the configuration referenced paths from displaying
 Script.ftl 	Fixed a bug that rendered extra whitespace before and after
 the script block

---
 .../main/resources/org/archive/crawler/restlet/Beans.ftl  | 4 ++--
 .../main/resources/org/archive/crawler/restlet/Job.ftl    | 8 ++++----
 .../main/resources/org/archive/crawler/restlet/Script.ftl | 4 +---
 3 files changed, 7 insertions(+), 9 deletions(-)

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 @@
 <td>
 <#if bean.propValuePreviouslyDescribed??>
 	&uarr;
-<#elseif !bean.propValue?? && !bean.properties??>
+<#elseif !bean.propValue?? && !bean.properties?? && !bean.get("class")??>
 	<#if bean.key?? && bean.field??>
 	<a href='../beans/${bean.key}'>${bean.key}</a>
 	<#else>
@@ -79,7 +79,7 @@
 	</#if>
 </#if>
 
-<#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)>
 <fieldset style='display:inline;vertical-align:top'>
 	<legend>${bean.get("class")}</legend>
 	<table>
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}
 	<h2>Files</h2>
 	<h3>Browser <a href='jobdir'>Job Directory</a></h3>
 	<h3>Configuration-referenced Paths</h3>
-	<#assign refPaths=job.referen! />
-	<#if !refPaths?has_content >
+	<#assign configRefPaths=job.configFiles! />
+	<#if !configRefPaths?has_content >
 		<i>build the job to discover referenced paths</i>
 	<#else>
 		<dl>
-			<#list refPaths as config>
+			<#list configRefPaths as config>
 			<dt>
 				${config.key}: ${config.name}
 			</dt>
 			<dd>
 				<#if config.path??>
-				<a href='/engine/anypath/${config.path.absolutePath}<#if config.path.absolutePath?ends_with("log")>?format=paged&amp;pos=-1&amp;lines=-128&amp;reverse=y</#if>'>${config.path.absolutePath}</a><#if config.editable> [<a href="/engine/anypath/${config.path.absolutePath}?format=textedit">edit</a>]</#if>
+				<a href='/engine/anypath/${config.path}<#if config.path?ends_with("log")>?format=paged&amp;pos=-1&amp;lines=-128&amp;reverse=y</#if>'>${config.path}</a><#if config.editable> [<a href="/engine/anypath/${config.path}?format=textedit">edit</a>]</#if>
 				<#else>
 				<i>unset</i>
 				</#if>
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 @@
 			<option<#if selectedEngine=scriptEngine.engine> selected='selected'</#if> value='${scriptEngine.engine}'>${scriptEngine.language}</option>
 			</#list>
 		</select>
-		<textarea rows='20' style='width:100%' name='script' id='editor'>
-			${script}
-		</textarea>
+		<textarea rows='20' style='width:100%' name='script' id='editor'>${script}</textarea>
 		<input type='submit' value='execute'></input>
 	</form>
 	The script will be executed in an engine preloaded