Author: kwright
Date: Mon Jul 7 13:04:53 2014
New Revision: 1608446
URL: http://svn.apache.org/r1608446
Log:
Fix javascript issue related to CONNECTORS-981
Modified:
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
Modified:
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java?rev=1608446&r1=1608445&r2=1608446&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
(original)
+++
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
Mon Jul 7 13:04:53 2014
@@ -827,14 +827,14 @@ public class SolrConnector extends org.a
" editconnection.maxdocumentlength.focus();\n"+
" return false;\n"+
" }\n"+
-" if (editconnection.maxdocumentlength.value == \"\" &&
(editconnection.extractupdate.value != \"true\" || (typeof
editconnection.extractupdate.checked != \"undefined\" &&
editconnection.extractupdate.checked == false)))\n"+
+" if (editconnection.maxdocumentlength.value == \"\" &&
((editconnection.extractupdatecheckbox.value == \"true\" &&
editconnection.extractupdate.checked == false) ||
(editconnection.extractupdatecheckbox.value != \"true\" &&
editconnection.extractupdate.value != \"true\")))\n"+
" {\n"+
"
alert(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.MaximumDocumentLengthRequiredUnlessExtractingUpdateHandler")+"\");\n"+
"
SelectTab(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.Documents")+"\");\n"+
" editconnection.maxdocumentlength.focus();\n"+
" return false;\n"+
" }\n"+
-" if (editconnection.contentfield.value == \"\" &&
(editconnection.extractupdate.value != \"true\" || (typeof
editconnection.extractupdate.checked != \"undefined\" &&
editconnection.extractupdate.checked == false)))\n"+
+" if (editconnection.contentfield.value == \"\" &&
((editconnection.extractupdatecheckbox.value == \"true\" &&
editconnection.extractupdate.checked == false) ||
(editconnection.extractupdatecheckbox.value != \"true\" &&
editconnection.extractupdate.value != \"true\")))\n"+
" {\n"+
"
alert(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.ContentFieldNameRequiredUnlessExtractingUpdateHandler")+"\");\n"+
"
SelectTab(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.Schema")+"\");\n"+
@@ -1488,6 +1488,7 @@ public class SolrConnector extends org.a
" <tr>\n"+
" <td class=\"description\"><nobr>" +
Messages.getBodyString(locale,"SolrConnector.UseExtractUpdateHandler") +
"</nobr></td>\n"+
" <td class=\"value\">\n"+
+" <input name=\"extractupdatecheckbox\" type=\"hidden\"
value=\"true\"/>\n"+
" <input name=\"extractupdatepresent\" type=\"hidden\" value=\"true\"/>\n"
);
if (!useExtractUpdate.equals("false"))
@@ -1524,6 +1525,7 @@ public class SolrConnector extends org.a
"<input type=\"hidden\" name=\"filenamefield\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(fileNameField)+"\"/>\n"+
"<input type=\"hidden\" name=\"mimetypefield\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(mimeTypeField)+"\"/>\n"+
"<input type=\"hidden\" name=\"contentfield\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(contentField)+"\"/>\n"+
+"<input name=\"extractupdatecheckbox\" type=\"hidden\" value=\"false\"/>\n"+
"<input type=\"hidden\" name=\"extractupdate\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(useExtractUpdate)+"\"/>\n"+
"<input name=\"extractupdatepresent\" type=\"hidden\" value=\"true\"/>\n"
);
