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 2017/05/12 05:37:47 UTC
svn commit: r1794924 - in
/manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main:
native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/
resources/org/apache/manifoldcf/agents/transformation/tikaservice/
Author: kwright
Date: Fri May 12 05:37:46 2017
New Revision: 1794924
URL: http://svn.apache.org/viewvc?rev=1794924&view=rev
Log:
Add javascript checking for illegal configuration
Modified:
manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_en_US.properties
manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_es_ES.properties
manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_ja_JP.properties
manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_zh_CN.properties
manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editConfiguration.js
Modified: manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_en_US.properties?rev=1794924&r1=1794923&r2=1794924&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_en_US.properties (original)
+++ manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_en_US.properties Fri May 12 05:37:46 2017
@@ -29,3 +29,6 @@ TikaExtractor.AddFieldMapping=Add field
TikaExtractor.Delete=Delete
TikaExtractor.DeleteFieldMapping=Delete field mapping
TikaExtractor.NoFieldNameSpecified=Please specify a field name
+TikaExtractor.PleaseSupplyAValidNumber=Please supply a valid number
+TikaExtractor.PleaseDontSpecifyAnyServerPathInformation=Please don't include server path information in host name
+TikaExtractor.HostNameCannotBeNull=Host name cannot be null
Modified: manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_es_ES.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_es_ES.properties?rev=1794924&r1=1794923&r2=1794924&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_es_ES.properties (original)
+++ manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_es_ES.properties Fri May 12 05:37:46 2017
@@ -29,3 +29,6 @@ TikaExtractor.NoFieldNameSpecified=Por f
TikaExtractor.TikaHostname=Tika hostname:
TikaExtractor.TikaPort=Tika port:
TikaExtractor.TikaServerTabName=Tika server
+TikaExtractor.PleaseSupplyAValidNumber=Please supply a valid number
+TikaExtractor.PleaseDontSpecifyAnyServerPathInformation=Please don't include server path information in host name
+TikaExtractor.HostNameCannotBeNull=Host name cannot be null
Modified: manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_ja_JP.properties?rev=1794924&r1=1794923&r2=1794924&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_ja_JP.properties (original)
+++ manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_ja_JP.properties Fri May 12 05:37:46 2017
@@ -29,3 +29,6 @@ TikaExtractor.AddFieldMapping=ãã
TikaExtractor.Delete=åé¤
TikaExtractor.DeleteFieldMapping=ãã£ã¼ã«ããããã³ã°ãåé¤
TikaExtractor.NoFieldNameSpecified=ãã£ã¼ã«ãåãæå®ãã¦ãã ãã
+TikaExtractor.PleaseSupplyAValidNumber=Please supply a valid number
+TikaExtractor.PleaseDontSpecifyAnyServerPathInformation=Please don't include server path information in host name
+TikaExtractor.HostNameCannotBeNull=Host name cannot be null
Modified: manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_zh_CN.properties?rev=1794924&r1=1794923&r2=1794924&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_zh_CN.properties (original)
+++ manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_zh_CN.properties Fri May 12 05:37:46 2017
@@ -29,3 +29,6 @@ TikaExtractor.AddFieldMapping=æ·»å
TikaExtractor.Delete=å é¤
TikaExtractor.DeleteFieldMapping=å é¤å段æ å°
TikaExtractor.NoFieldNameSpecified=æªæå®å段å
+TikaExtractor.PleaseSupplyAValidNumber=Please supply a valid number
+TikaExtractor.PleaseDontSpecifyAnyServerPathInformation=Please don't include server path information in host name
+TikaExtractor.HostNameCannotBeNull=Host name cannot be null
Modified: manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editConfiguration.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editConfiguration.js?rev=1794924&r1=1794923&r2=1794924&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editConfiguration.js (original)
+++ manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editConfiguration.js Fri May 12 05:37:46 2017
@@ -17,5 +17,29 @@
<script type="text/javascript">
<!--
+
+function checkConfig()
+{
+ if (editconnection.tikaPort.value != "" && !isInteger(editconnection.tikaPort.value))
+ {
+ alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('TikaExtractor.PleaseSupplyAValidNumber'))");
+ editconnection.tikaPort.focus();
+ return false;
+ }
+ if (editconnection.tikaHostname.value.indexOf("/") >= 0)
+ {
+ alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('TikaExtractor.PleaseDontSpecifyAnyServerPathInformation'))");
+ editconnection.tikaHostname.focus();
+ return false;
+ }
+ if (editconnection.tikaHostname.value == "")
+ {
+ alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('TikaExtractor.HostNameCannotBeNull'))");
+ editconnection.tikaHostname.focus();
+ return false;
+ }
+ return true;
+}
+
//-->
</script>