manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1601872 - in /manifoldcf/branches/CONNECTORS-961: connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/ connectors/forcedmetadata/connector/src/main/resources/org/apache/manif...
Date Wed, 11 Jun 2014 12:31:35 GMT
Author: kwright
Date: Wed Jun 11 12:31:34 2014
New Revision: 1601872

URL: http://svn.apache.org/r1601872
Log:
More debugging

Modified:
    manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_en_US.properties
    manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_ForcedMetadata.html
    manifoldcf/branches/CONNECTORS-961/framework/crawler-ui/src/main/webapp/editjob.jsp

Modified: manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_en_US.properties?rev=1601872&r1=1601871&r2=1601872&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_en_US.properties
(original)
+++ manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/forcedmetadata/common_en_US.properties
Wed Jun 11 12:31:34 2014
@@ -21,4 +21,5 @@ ForcedMetadata.ParameterValue=Parameter 
 ForcedMetadata.Delete=Delete
 ForcedMetadata.Deleteforcedmetadatanumber=Delete forced metadata #
 ForcedMetadata.Add=Add
-ForcedMetadata.Addforcedmetadata=Add forced metadata item
\ No newline at end of file
+ForcedMetadata.Addforcedmetadata=Add forced metadata item
+ForcedMetadata.NoForcedMetadataSpecified=No forced metadata specified

Modified: manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_ForcedMetadata.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_ForcedMetadata.html?rev=1601872&r1=1601871&r2=1601872&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_ForcedMetadata.html
(original)
+++ manifoldcf/branches/CONNECTORS-961/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_ForcedMetadata.html
Wed Jun 11 12:31:34 2014
@@ -15,7 +15,7 @@
  limitations under the License.
 -->
 
-#if($TabName == $ResourceBundle.getString('ForcedMetadata.ForcedMetadata' && $SeqNum
== $SelectedNum))
+#if($TabName == $ResourceBundle.getString('ForcedMetadata.ForcedMetadata') && $SeqNum
== $SelectedNum)
 
 <table class="displaytable">
   <tr>
@@ -38,11 +38,11 @@
         <tr class="oddformrow">
     #end
           <td class="formcolumncell">
-            <a name="s${SeqNum}_forcedmetadata_$paramcounter_tag"/>
-            <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Delete'))"
alt="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Deleteforcedmetadatanumber'))$paramcounter"
onclick='javascript:s${SeqNum}_DeleteForcedMetadata("$paramcounter");'/>
-            <input type="hidden" name="s${SeqNum}_forcedmetadata_$paramcounter_op" value="Continue"/>
-            <input type="hidden" name="s${SeqNum}_forcedmetadata_$paramcounter_name" value="$Encoder.attributeEscape($paramrecord.get('parameter')"/>
-            <input type="hidden" name="s${SeqNum}_forcedmetadata_$paramcounter_value"
value="$Encoder.attributeEscape($paramrecord.get('value')"/>
+            <a name="s${SeqNum}_forcedmetadata_${paramcounter}_tag"/>
+            <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Delete'))"
alt="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Deleteforcedmetadatanumber'))${paramcounter}"
onclick='javascript:s${SeqNum}_DeleteForcedMetadata(${paramcounter});'/>
+            <input type="hidden" name="s${SeqNum}_forcedmetadata_${paramcounter}_op" value="Continue"/>
+            <input type="hidden" name="s${SeqNum}_forcedmetadata_${paramcounter}_name"
value="$Encoder.attributeEscape($paramrecord.get('parameter'))"/>
+            <input type="hidden" name="s${SeqNum}_forcedmetadata_${paramcounter}_value"
value="$Encoder.attributeEscape($paramrecord.get('value'))"/>
           </td>
           <td class="formcolumncell">
             <nobr>$Encoder.bodyEscape($paramrecord.get('parameter'))</nobr>
@@ -62,7 +62,7 @@
             <a name="s${SeqNum}_forcedmetadata_tag"/>
             <input type="hidden" name="s${SeqNum}_forcedmetadata_op" value="Continue"/>
             <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Add'))"
alt="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Addforcedmetadata'))"
onclick="javascript:s${SeqNum}_AddForcedMetadata();"/>
-            <input type="hidden" name="s${SeqNum}_forcedmetadata_count" value="$paramcounter"/>
+            <input type="hidden" name="s${SeqNum}_forcedmetadata_count" value="${paramcounter}"/>
           </td>
           <td class="formcolumncell">
             <input type="text" name="s${SeqNum}_forcedmetadata_name" size="30" value=""/>
@@ -80,9 +80,9 @@
 
   #set($paramcounter = 0)
   #foreach($paramrecord in $Parameters)
-<input type="hidden" name="s${SeqNum}_forcedmetadata_$paramcounter_name" value="$Encoder.attributeEscape($paramrecord.get('parameter'))"
/>
-<input type="hidden" name="s${SeqNum}_forcedmetadata_$paramcounter_value" value="$Encoder.attributeEscape($paramrecord.get('value'))"
/>
+<input type="hidden" name="s${SeqNum}_forcedmetadata_${paramcounter}_name" value="$Encoder.attributeEscape($paramrecord.get('parameter'))"
/>
+<input type="hidden" name="s${SeqNum}_forcedmetadata_${paramcounter}_value" value="$Encoder.attributeEscape($paramrecord.get('value'))"
/>
   #end
-<input type="hidden" name="s${SeqNum}_forcedmetadata_count" value="$paramcounter"/>
+<input type="hidden" name="s${SeqNum}_forcedmetadata_count" value="${paramcounter}"/>
 
 #end

Modified: manifoldcf/branches/CONNECTORS-961/framework/crawler-ui/src/main/webapp/editjob.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-961/framework/crawler-ui/src/main/webapp/editjob.jsp?rev=1601872&r1=1601871&r2=1601872&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-961/framework/crawler-ui/src/main/webapp/editjob.jsp (original)
+++ manifoldcf/branches/CONNECTORS-961/framework/crawler-ui/src/main/webapp/editjob.jsp Wed
Jun 11 12:31:34 2014
@@ -1663,7 +1663,7 @@
 		{
 			try
 			{
-				outputConnector.outputSpecificationBody(new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),outputSpecification,1,tabSequenceInt,tabName);
+				outputConnector.outputSpecificationBody(new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),outputSpecification,1+transformationConnections.length,tabSequenceInt,tabName);
 			}
 			finally
 			{
@@ -1693,6 +1693,23 @@
 <%
 		}
 	}
+	
+	for (int j = 0; j < transformationConnections.length; j++)
+	{
+		ITransformationConnector transformationConnector = transformationConnectorPool.grab(transformationConnections[j]);
+		if (transformationConnector != null)
+		{
+			try
+			{
+				transformationConnector.outputSpecificationBody(new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),transformationSpecifications[j],1+j,tabSequenceInt,tabName);
+			}
+			finally
+			{
+				transformationConnectorPool.release(transformationConnections[j],transformationConnector);
+			}
+		}
+	}
+
 %>
 		  <table class="displaytable">
 			<tr><td class="separator" colspan="4"><hr/></td></tr>



Mime
View raw message