Author: kwright
Date: Mon Jan 28 00:48:47 2013
New Revision: 1439216
URL: http://svn.apache.org/viewvc?rev=1439216&view=rev
Log:
Add view job support for forced metadata.
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp?rev=1439216&r1=1439215&r2=1439216&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewjob.jsp Mon Jan
28 00:48:47 2013
@@ -124,7 +124,8 @@
String[] relationshipTypes =
RepositoryConnectorFactory.getRelationshipTypes(threadContext,connection.getClassName());
Map hopCountFilters = job.getHopCountFilters();
int hopcountMode = job.getHopcountMode();
-
+ Map<String,Set<String>> forcedMetadata =
job.getForcedMetadata();
+
//threadContext.save("OutputSpecification",job.getOutputSpecification());
//threadContext.save("OutputConnection",outputConnection);
//threadContext.save("DocumentSpecification",job.getSpecification());
@@ -504,7 +505,54 @@
j++;
}
}
-
+
+ if (forcedMetadata.size() == 0)
+ {
+%>
+ <tr><td class="message"
colspan="4"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.NoForcedMetadata")%></td></tr>
+<%
+ }
+ else
+ {
+%>
+ <tr>
+ <td class="separator" colspan="4"><hr/></td>
+ </tr>
+ <tr>
+ <td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.ForcedMetadataColon")%></nobr></td>
+ <td class="value" colspan="3">
+<%
+ String[] paramNames = new String[forcedMetadata.size()];
+ int q = 0;
+ for (String paramName : forcedMetadata.keySet())
+ {
+ paramNames[q++] = paramName;
+ }
+ java.util.Arrays.sort(paramNames);
+ for (String paramName : paramNames)
+ {
+ Set<String> values =
forcedMetadata.get(paramName);
+ String[] paramValues = new
String[values.size()];
+ q = 0;
+ for (String paramValue : values)
+ {
+ paramValues[q++] = paramValue;
+ }
+ java.util.Arrays.sort(paramValues);
+ for (String paramValue : paramValues)
+ {
+
out.println(org.apache.manifoldcf.ui.util.Encoder.bodyEscape(paramName) + " = "
+ org.apache.manifoldcf.ui.util.Encoder.bodyEscape(paramValue));
+%>
+ <br/>
+<%
+ }
+ }
+%>
+ </td>
+ </tr>
+<%
+ }
+
if (relationshipTypes != null && relationshipTypes.length > 0)
{
%>
Modified:
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1439216&r1=1439215&r2=1439216&view=diff
==============================================================================
---
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
(original)
+++
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
Mon Jan 28 00:48:47 2013
@@ -623,6 +623,8 @@ viewjob.OutputConnectionColon=Output con
viewjob.RepositoryConnectionColon=Repository connection:
viewjob.PriorityColon=Priority:
viewjob.StartMethodColon=Start method:
+viewjob.ForcedMetadataColon=Forced metadata:
+viewjob.NoForcedMetadata=No forced metadata
viewauthority.ViewAuthorityConnectionStatus=View Authority Connection Status
viewauthority.NameColon=Name:
Modified:
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties?rev=1439216&r1=1439215&r2=1439216&view=diff
==============================================================================
---
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
(original)
+++
manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
Mon Jan 28 00:48:47 2013
@@ -624,6 +624,8 @@ viewjob.OutputConnectionColon=åºå
viewjob.RepositoryConnectionColon=ãªãã¸ããªã³ãã¯ã·ã§ã³ï¼
viewjob.PriorityColon=åªå
é ä½ï¼
viewjob.StartMethodColon=éå§ã¡ã½ããï¼
+viewjob.ForcedMetadataColon=Forced metadata:
+viewjob.NoForcedMetadata=No forced metadata
viewauthority.ViewAuthorityConnectionStatus=権éã³ãã¯ã·ã§ã³ç¶æ
ã®è¡¨ç¤º
viewauthority.NameColon=ååï¼