svn commit: r1558025 - in /manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main: java/org/apache/manifoldcf/agents/output/solr/ native2ascii/org/apache/manifoldcf/agents/output/solr/

[kwright]

Author: kwright
Date: Tue Jan 14 13:10:10 2014
New Revision: 1558025

URL: http://svn.apache.org/r1558025
Log:
Fix how hiddens are handled

Modified:
    
manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
    
manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
    
manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties

Modified: 
manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java?rev=1558025&r1=1558024&r2=1558025&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 Tue Jan 14 13:10:10 2014
@@ -2381,7 +2381,7 @@ public class SolrConnector extends org.a
       
       String keepMetadataValue;
       if (keepMetadata)
-        keepMetadataValue = "checked";
+        keepMetadataValue = " checked=\"true\"";
       else
         keepMetadataValue = "";
 
@@ -2407,9 +2407,9 @@ public class SolrConnector extends org.a
 "  </tr>\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td 
class=\"description\">\n"+Messages.getBodyString(locale,"SolrConnector.KeepAllMetadata")+"</td>\n"+
+"    <td 
class=\"description\"><nobr>"+Messages.getBodyString(locale,"SolrConnector.KeepAllMetadata")+"</nobr></td>\n"+
 "    <td class=\"value\">\n"+
-"       <input type=\"checkbox\" "+keepMetadataValue+" 
name=\"solr_keepallmetadata\" value=\"true\" />\n"+
+"       <input type=\"checkbox\""+keepMetadataValue+" 
name=\"solr_keepallmetadata\" value=\"true\"/>\n"+
 "    </td>\n"+
 "  </tr>\n"+
 "</table>\n"
@@ -2420,6 +2420,7 @@ public class SolrConnector extends org.a
       // Hiddens for field mapping
       i = 0;
       int fieldCounter = 0;
+      String keepMetadataValue = "true";
       while (i < os.getChildCount()) {
         SpecificationNode sn = os.getChild(i++);
         if (sn.getType().equals(SolrConfig.NODE_FIELDMAP)) {
@@ -2437,12 +2438,13 @@ public class SolrConnector extends org.a
         }
         else if(sn.getType().equals(SolrConfig.NODE_KEEPMETADATA))
         {
-          out.print(
-"<input type=\"hidden\" name=\"solr_keepallmetadata\" 
value=\""+sn.getAttributeValue(SolrConfig.ATTRIBUTE_VALUE)+"\"/>\n"
-          );
+          keepMetadataValue = sn.getAttributeValue(SolrConfig.ATTRIBUTE_VALUE);
         }
       }
       out.print(
+"<input type=\"hidden\" name=\"solr_keepallmetadata\" 
value=\""+keepMetadataValue+"\"/>\n"
+      );
+      out.print(
 "<input type=\"hidden\" name=\"solr_fieldmapping_count\" 
value=\""+Integer.toString(fieldCounter)+"\"/>\n"
       );
     }

Modified: 
manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties?rev=1558025&r1=1558024&r2=1558025&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
 Tue Jan 14 13:10:10 2014
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 SolrConnector.Arguments=Arguments
-SolrConnector.KeepAllMetadata=Keep all metadata
+SolrConnector.KeepAllMetadata=Keep all metadata:
 SolrConnector.Arguments2=Arguments:
 SolrConnector.Commits=Commits
 SolrConnector.Documents=Documents

Modified: 
manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties?rev=1558025&r1=1558024&r2=1558025&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
 Tue Jan 14 13:10:10 2014
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 SolrConnector.Arguments=引数
-SolrConnector.KeepAllMetadata=Keep all metadata
+SolrConnector.KeepAllMetadata=Keep all metadata:
 SolrConnector.Arguments2=引数：
 SolrConnector.Commits=コミット
 SolrConnector.Documents=コンテンツ