You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2015/03/12 13:26:16 UTC
svn commit: r1666160 - in /manifoldcf/trunk: ./
connectors/forcedmetadata/connector/src/main/java/org/apache/manifoldcf/agents/transformation/forcedmetadata/
connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transforma...
Author: kwright
Date: Thu Mar 12 12:26:15 2015
New Revision: 1666160
URL: http://svn.apache.org/r1666160
Log:
Fix for CONNECTORS-1172.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/forcedmetadata/connector/src/main/java/org/apache/manifoldcf/agents/transformation/forcedmetadata/ForcedMetadataConnector.java
manifoldcf/trunk/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_Expressions.html
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1666160&r1=1666159&r2=1666160&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Thu Mar 12 12:26:15 2015
@@ -3,6 +3,10 @@ $Id$
======================= 2.1-dev =====================
+CONNECTORS-1172: Fix metadata adjuster 'keep all metadata' switch
+UI.
+(Frank Brendel, Karl Wright)
+
CONNECTORS-1171: Fix SharePoint connector path mapping UI.
(Frank Brendel, Karl Wright)
Modified: manifoldcf/trunk/connectors/forcedmetadata/connector/src/main/java/org/apache/manifoldcf/agents/transformation/forcedmetadata/ForcedMetadataConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/forcedmetadata/connector/src/main/java/org/apache/manifoldcf/agents/transformation/forcedmetadata/ForcedMetadataConnector.java?rev=1666160&r1=1666159&r2=1666160&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/forcedmetadata/connector/src/main/java/org/apache/manifoldcf/agents/transformation/forcedmetadata/ForcedMetadataConnector.java (original)
+++ manifoldcf/trunk/connectors/forcedmetadata/connector/src/main/java/org/apache/manifoldcf/agents/transformation/forcedmetadata/ForcedMetadataConnector.java Thu Mar 12 12:26:15 2015
@@ -467,7 +467,7 @@ public class ForcedMetadataConnector ext
while (i < os.getChildCount())
{
SpecificationNode node = os.getChild(i);
- if (node.getType().equals(NODE_KEEPMETADATA))
+ if (node.getType().equals(NODE_FILTEREMPTY))
os.removeChild(i);
else
i++;
Modified: manifoldcf/trunk/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_Expressions.html
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_Expressions.html?rev=1666160&r1=1666159&r2=1666160&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_Expressions.html (original)
+++ manifoldcf/trunk/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_Expressions.html Thu Mar 12 12:26:15 2015
@@ -132,8 +132,8 @@
#end
<input type="hidden" name="s${SEQNUM}_expression_count" value="${paramcounter}"/>
<input type="hidden" name="s${SEQNUM}_keepallmetadata_present" value="true"/>
-<input type="hidden" name="s${SEQNUM}_keepallmetadata" value="$Encoder.bodyEscape($FILTEREMPTY)"/>
+<input type="hidden" name="s${SEQNUM}_keepallmetadata" value="$Encoder.attributeEscape($KEEPALLMETADATA)"/>
<input type="hidden" name="s${SEQNUM}_filterempty_present" value="true"/>
-<input type="hidden" name="s${SEQNUM}_filterempty" value="$Encoder.bodyEscape($FILTEREMPTY)"/>
+<input type="hidden" name="s${SEQNUM}_filterempty" value="$Encoder.attributeEscape($FILTEREMPTY)"/>
#end