Return-Path: 
 <commits-return-5484-apmail-manifoldcf-commits-archive=manifoldcf.apache.org@manifoldcf.apache.org>
X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org
Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id D55DF1080D
	for <apmail-manifoldcf-commits-archive@www.apache.org>;
 Tue, 14 Jan 2014 13:01:13 +0000 (UTC)
Received: (qmail 76587 invoked by uid 500); 14 Jan 2014 13:01:12 -0000
Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org
Received: (qmail 76536 invoked by uid 500); 14 Jan 2014 13:01:12 -0000
Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@manifoldcf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@manifoldcf.apache.org>
List-Post: <mailto:commits@manifoldcf.apache.org>
List-Id: <commits.manifoldcf.apache.org>
Reply-To: dev@manifoldcf.apache.org
Delivered-To: mailing list commits@manifoldcf.apache.org
Received: (qmail 76529 invoked by uid 99); 14 Jan 2014 13:01:12 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jan 2014 13:01:12 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jan 2014 13:01:09 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 7BF772388AAA;
	Tue, 14 Jan 2014 13:00:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1558024 -
 /manifoldcf/branches/CONNECTORS-840-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
Date: Tue, 14 Jan 2014 13:00:48 -0000
To: commits@manifoldcf.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140114130048.7BF772388AAA@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kwright
Date: Tue Jan 14 13:00:48 2014
New Revision: 1558024

URL: http://svn.apache.org/r1558024
Log:
Fix UI defaults for backwards compatibility

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

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=1558024&r1=1558023&r2=1558024&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:00:48 2014
@@ -2330,7 +2330,7 @@ public class SolrConnector extends org.a
 
       int fieldCounter = 0;
       i = 0;
-      SpecificationNode keepMetadata = null;
+      boolean keepMetadata = true;
       while (i < os.getChildCount()) {
         SpecificationNode sn = os.getChild(i++);
         if (sn.getType().equals(SolrConfig.NODE_FIELDMAP)) {
@@ -2368,7 +2368,7 @@ public class SolrConnector extends org.a
           fieldCounter++;
         }
         else if(sn.getType().equals(SolrConfig.NODE_KEEPMETADATA)) {
-            keepMetadata = sn;
+          keepMetadata = Boolean.parseBoolean(sn.getAttributeValue(SolrConfig.ATTRIBUTE_VALUE));
         }
       }
       
@@ -2379,11 +2379,12 @@ public class SolrConnector extends org.a
         );
       }
       
-      String keepMetadataValue = "";
-      if(keepMetadata != null) {
-          keepMetadataValue = keepMetadata.getAttributeValue(SolrConfig.ATTRIBUTE_VALUE);
-          keepMetadataValue = !keepMetadataValue.isEmpty() && keepMetadataValue != null && keepMetadataValue.equals("true") ? "checked" : "";
-      }
+      String keepMetadataValue;
+      if (keepMetadata)
+        keepMetadataValue = "checked";
+      else
+        keepMetadataValue = "";
+
       out.print(
 "        <tr class=\"formrow\"><td class=\"formseparator\" colspan=\"3\"><hr/></td></tr>\n"+
 "        <tr class=\"formrow\">\n"+
@@ -2401,18 +2402,16 @@ public class SolrConnector extends org.a
 "            <nobr><input type=\"text\" size=\"15\" name=\"solr_fieldmapping_target\" value=\"\"/></nobr>\n"+
 "          </td>\n"+
 "        </tr>\n"+
-"        <tr class=\"formrow\">\n"+
-"          <td class=\"formcolumncell\">\n"+
-"              <input type=\"checkbox\" "+keepMetadataValue+" name=\"solr_keepallmetadata\" value=\"true\" />\n"+
-"          </td>\n"+
-"          <td class=\"formcolumncell\">\n"+
-              Messages.getAttributeString(locale,"SolrConnector.KeepAllMetadata")+
-"          </td>\n"+
-"          <td class=\"formcolumncell\">\n</td>\n"+
-"        </tr>\n"+
 "      </table>\n"+
 "    </td>\n"+
 "  </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=\"value\">\n"+
+"       <input type=\"checkbox\" "+keepMetadataValue+" name=\"solr_keepallmetadata\" value=\"true\" />\n"+
+"    </td>\n"+
+"  </tr>\n"+
 "</table>\n"
       );
     }