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

[kwright]

Author: kwright
Date: Wed Jun 25 15:54:34 2014
New Revision: 1605458

URL: http://svn.apache.org/r1605458
Log:
Put in javascript checks for illegal conditions

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

Modified: 
manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java?rev=1605458&r1=1605457&r2=1605458&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 Wed Jun 25 15:54:34 2014
@@ -824,6 +824,20 @@ public class SolrConnector extends org.a
 "    editconnection.maxdocumentlength.focus();\n"+
 "    return false;\n"+
 "  }\n"+
+"  if (editconnection.maxdocumentlength.value == \"\" && 
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\")\n"+
+"  {\n"+
+"    
alert(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.ContentFieldNameRequiredUnlessExtractingUpdateHandler")+"\");\n"+
+"    
SelectTab(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.Documents")+"\");\n"+
+"    editconnection.contentfield.focus();\n"+
+"    return false;\n"+
+"  }\n"+
 "  if (editconnection.commitwithin.value != \"\" && 
!isInteger(editconnection.commitwithin.value))\n"+
 "  {\n"+
 "    
alert(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.CommitWithinValueMustBeAnInteger")+"\");\n"+

Modified: 
manifoldcf/branches/CONNECTORS-981/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-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties?rev=1605458&r1=1605457&r2=1605458&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
 Wed Jun 25 15:54:34 2014
@@ -96,6 +96,8 @@ SolrConnector.MaximumDocumentLengthMustB
 SolrConnector.CommitWithinValueMustBeAnInteger=Commit-within value must be an 
integer
 SolrConnector.MaximumDocumentLengthMustBeAnInteger=Maximum document length 
must be an integer
 SolrConnector.ArgumentNameCannotBeAnEmptyString=Argument name cannot be an 
empty string
+SolrConnector.MaximumDocumentLengthRequiredUnlessExtractingUpdateHandler=Maximum
 document length required unless using extract update handler
+SolrConnector.ContentFieldNameRequiredUnlessExtractingUpdateHandler=Content 
field name required unless using extract update handler
 SolrConnector.DeleteCert=Delete cert 
 SolrConnector.Delete=Delete
 SolrConnector.DeleteArgument=Delete argument #

Modified: 
manifoldcf/branches/CONNECTORS-981/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-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties?rev=1605458&r1=1605457&r2=1605458&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
 Wed Jun 25 15:54:34 2014
@@ -96,6 +96,8 @@ SolrConnector.MaximumDocumentLengthMustB
 
SolrConnector.CommitWithinValueMustBeAnInteger=Commit-within値には整数をå…
¥åŠ›ã—てください
 
SolrConnector.MaximumDocumentLengthMustBeAnInteger=最大コンテンツ長さには整数をå
…¥åŠ›ã—てください
 SolrConnector.ArgumentNameCannotBeAnEmptyString=引数名を入力してくだ
さい
+SolrConnector.MaximumDocumentLengthRequiredUnlessExtractingUpdateHandler=Maximum
 document length required unless using extract update handler
+SolrConnector.ContentFieldNameRequiredUnlessExtractingUpdateHandler=Content 
field name required unless using extract update handler
 SolrConnector.DeleteCert=証明書を削除 
 SolrConnector.Delete=削除
 SolrConnector.DeleteArgument=引数を削除 #

Modified: 
manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties?rev=1605458&r1=1605457&r2=1605458&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-981/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties
 Wed Jun 25 15:54:34 2014
@@ -96,6 +96,8 @@ SolrConnector.MaximumDocumentLengthMustB
 SolrConnector.CommitWithinValueMustBeAnInteger=CommitWithin值必须为整数
 SolrConnector.MaximumDocumentLengthMustBeAnInteger=最大文档长度必
须为整数
 SolrConnector.ArgumentNameCannotBeAnEmptyString=请输入参数名
+SolrConnector.MaximumDocumentLengthRequiredUnlessExtractingUpdateHandler=Maximum
 document length required unless using extract update handler
+SolrConnector.ContentFieldNameRequiredUnlessExtractingUpdateHandler=Content 
field name required unless using extract update handler
 SolrConnector.DeleteCert=删除证书 
 SolrConnector.Delete=删除
 SolrConnector.DeleteArgument=删除参数 #