manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1794890 - in /manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main: native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/ resources/org/apache/manifoldcf/agents/transformation/tikaservice/
Date Thu, 11 May 2017 20:33:34 GMT
Author: kwright
Date: Thu May 11 20:33:33 2017
New Revision: 1794890

URL: http://svn.apache.org/viewvc?rev=1794890&view=rev
Log:
Revamp UI to match new code

Added:
    manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editConfiguration.js
      - copied, changed from r1794808, manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification.js
    manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editConfiguration_Server.html
      - copied, changed from r1794808, manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification_TikaType.html
    manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/viewConfiguration.html
      - copied, changed from r1794808, manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/viewSpecification.html
Removed:
    manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification_Boilerplate.html
    manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification_TikaType.html
Modified:
    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/editSpecification.js
    manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/viewSpecification.html

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=1794890&r1=1794889&r2=1794890&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
Thu May 11 20:33:33 2017
@@ -15,8 +15,6 @@
 
 TikaExtractor.FieldMappingTabName=Trazar un mapa de campaña
 TikaExtractor.ExceptionsTabName=excepciones
-TikaExtractor.BoilerplateTabName=repetitivo
-TikaExtractor.BoilerplateExtractorColon=extractora repetitivo:
 TikaExtractor.NoExtractionSelected=-- Sin extracción seleccionado --
 TikaExtractor.ExtractArticles=Extracto de artículos
 TikaExtractor.ExtractArticleSentences=Extraer frases artículo
@@ -39,8 +37,4 @@ TikaExtractor.NoFieldNameSpecified=Por f
 TikaExtractor.IgnoreTikaExceptions=No haga caso de excepciones Tika:
 TikaExtractor.TikaHostname=Tika hostname:
 TikaExtractor.TikaPort=Tika port:
-TikaExtractor.TikaRetry=Intervalo de reintento (ms):
-TikaExtractor.TikaParsersSelected=Tika Parsers
-TikaExtractor.TikaServerSelected=Tika Server
-TikaExtractor.TikaTypeTabName=Tika type
-TikaExtractor.TikaType=Tika type:
+TikaExtractor.TikaServerTabName=Tika server

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=1794890&r1=1794889&r2=1794890&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
Thu May 11 20:33:33 2017
@@ -15,11 +15,7 @@
 
 TikaExtractor.TikaHostname=Tika hostname:
 TikaExtractor.TikaPort=Tika port:
-TikaExtractor.TikaRetry=Retry interval (ms):
-TikaExtractor.TikaParsersSelected=Tika Parsers
-TikaExtractor.TikaServerSelected=Tika Server
-TikaExtractor.TikaTypeTabName=Tika type
-TikaExtractor.TikaType=Tika type:
+TikaExtractor.TikaServerTabName=Tika server
 TikaExtractor.FieldMappingTabName=フィールドマッピング
 TikaExtractor.ExceptionsTabName=例外
 TikaExtractor.BoilerplateTabName=Boilerplate

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=1794890&r1=1794889&r2=1794890&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
Thu May 11 20:33:33 2017
@@ -15,15 +15,9 @@
 
 TikaExtractor.TikaHostname=Tika hostname:
 TikaExtractor.TikaPort=Tika port:
-TikaExtractor.TikaRetry=Retry interval (ms):
-TikaExtractor.TikaParsersSelected=Tika Parsers
-TikaExtractor.TikaServerSelected=Tika Server
-TikaExtractor.TikaTypeTabName=Tika type
-TikaExtractor.TikaType=Tika type:
+TikaExtractor.TikaServerTabName=Tika server
 TikaExtractor.FieldMappingTabName=字段映射
 TikaExtractor.ExceptionsTabName=异常
-TikaExtractor.BoilerplateTabName=Boilerplate
-TikaExtractor.BoilerplateExtractorColon=Boilerplate extractor:
 TikaExtractor.NoExtractionSelected=-- No extraction selected --
 TikaExtractor.ExtractArticles=Extract articles
 TikaExtractor.ExtractArticleSentences=Extract article sentences

Copied: manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editConfiguration.js
(from r1794808, manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification.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?p2=manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editConfiguration.js&p1=manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification.js&r1=1794808&r2=1794890&rev=1794890&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification.js
(original)
+++ manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editConfiguration.js
Thu May 11 20:33:33 2017
@@ -17,42 +17,5 @@
 
 <script type="text/javascript">
 <!--
-function s${SEQNUM}_addFieldMapping()
-{
-  if (editjob.s${SEQNUM}_fieldmapping_source.value == "")
-  {
-    alert("$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.NoFieldNameSpecified'))");
-    editjob.s${SEQNUM}_fieldmapping_source.focus();
-    return;
-  }
-  editjob.s${SEQNUM}_fieldmapping_op.value="Add";
-  postFormSetAnchor("s${SEQNUM}_fieldmapping");
-}
-
-function s${SEQNUM}_deleteFieldMapping(i)
-{
-  // Set the operation
-  eval("editjob.s${SEQNUM}_fieldmapping_op_"+i+".value=\"Delete\"");
-  // Submit
-  if (editjob.s${SEQNUM}_fieldmapping_count.value==i)
-    postFormSetAnchor("s${SEQNUM}_fieldmapping");
-  else
-    postFormSetAnchor("s${SEQNUM}_fieldmapping_"+i)
-  // Undo, so we won't get two deletes next time
-  eval("editjob.s${SEQNUM}_fieldmapping_op_"+i+".value=\"Continue\"");
-}
-
-function s${SEQNUM}_tikaTypeChanged(tikaServer)
-{
-	var elements = document.getElementsByClassName("hiddenParam");
-	for(var i=0; i < elements.length; i++) {
-		if(tikaServer.value == 'false') {
-			elements[i].style.visibility = 'hidden';
-		} else {
-			elements[i].style.visibility = 'visible';
-		}
-	}
-}
-
 //-->
 </script>

Copied: manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editConfiguration_Server.html
(from r1794808, manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification_TikaType.html)
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editConfiguration_Server.html?p2=manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editConfiguration_Server.html&p1=manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification_TikaType.html&r1=1794808&r2=1794890&rev=1794890&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification_TikaType.html
(original)
+++ manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editConfiguration_Server.html
Thu May 11 20:33:33 2017
@@ -15,75 +15,27 @@
  limitations under the License.
 -->
 
-#if($TABNAME == $ResourceBundle.getString('TikaExtractor.TikaTypeTabName') && ${SEQNUM}
== ${SELECTEDNUM})
+#if($TABNAME == $ResourceBundle.getString('TikaExtractor.TikaServerTabName'))
 
 <table class="displaytable">
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaType'))</nobr></td>
-    <td class="value">
-      <select name="s${SEQNUM}_tikaserver" onchange='javascript:s${SEQNUM}_tikaTypeChanged(this);'>
-  #if($TIKASERVER == 'false')
-        <option value="false" selected="true">$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaParsersSelected'))</option>
-  #else
-        <option value="false">$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaParsersSelected'))</option>
-  #end
-  #if($TIKASERVER == 'true')
-        <option value="true" selected="true">$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaServerSelected'))</option>
-  #else
-        <option value="true">$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaServerSelected'))</option>
-  #end
-      </select>
-    </td>
-  </tr>
-  #if($TIKASERVER == 'true')
-  <tr class="hiddenParam"><td class="separator" colspan="2"><hr/></td></tr>
-  <tr class="hiddenParam">
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaHostname'))</nobr></td>
-    <td class="value"><input name="s${SEQNUM}_tikahostname" type="text"
-      value="$Encoder.attributeEscape($TIKAHOSTNAME)" size="16" />
-    </td>
-  </tr>
-  <tr class="hiddenParam">
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaPort'))</nobr></td>
-    <td class="value"><input name="s${SEQNUM}_tikaport" type="text"
-      value="$Encoder.attributeEscape($TIKAPORT)" size="16" />
-    </td>
-  </tr>
-  <tr class="hiddenParam">
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaRetry'))</nobr></td>
-    <td class="value"><input name="s${SEQNUM}_tikaretry" type="text"
-      value="$Encoder.attributeEscape($TIKARETRY)" size="16" />
-    </td>
-  </tr>
-  #else
-  <tr class="hiddenParam" style="visibility:hidden"><td class="separator" colspan="2"><hr/></td></tr>
-  <tr class="hiddenParam" style="visibility:hidden">
     <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaHostname'))</nobr></td>
-    <td class="value"><input name="s${SEQNUM}_tikahostname" type="text"
+    <td class="value"><input name="tikahostname" type="text"
       value="$Encoder.attributeEscape($TIKAHOSTNAME)" size="16" />
     </td>
   </tr>
-  <tr class="hiddenParam" style="visibility:hidden">
+  <tr>
     <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaPort'))</nobr></td>
-    <td class="value"><input name="s${SEQNUM}_tikaport" type="text"
-      value="$Encoder.attributeEscape($TIKAPORT)" size="16" />
-    </td>
-  </tr>
-  <tr class="hiddenParam" style="visibility:hidden">
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaRetry'))</nobr></td>
-    <td class="value"><input name="s${SEQNUM}_tikaretry" type="text"
-      value="$Encoder.attributeEscape($TIKARETRY)" size="16" />
+    <td class="value"><input name="tikaport" type="text"
+      value="$Encoder.attributeEscape($TIKAPORT)" size="5" />
     </td>
   </tr>
-  #end
 </table>
 
 #else
 
-<input type="hidden" name="s${SEQNUM}_tikaserver" value="$Encoder.attributeEscape($TIKASERVER)"/>
-<input type="hidden" name="s${SEQNUM}_tikahostname" value="$Encoder.attributeEscape($TIKAHOSTNAME)"/>
-<input type="hidden" name="s${SEQNUM}_tikaport" value="$Encoder.attributeEscape($TIKAPORT)"/>
-<input type="hidden" name="s${SEQNUM}_tikaretry" value="$Encoder.attributeEscape($TIKARETRY)"/>
+<input type="hidden" name="tikahostname" value="$Encoder.attributeEscape($TIKAHOSTNAME)"/>
+<input type="hidden" name="tikaport" value="$Encoder.attributeEscape($TIKAPORT)"/>
 
 #end
\ No newline at end of file

Modified: manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification.js?rev=1794890&r1=1794889&r2=1794890&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification.js
(original)
+++ manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification.js
Thu May 11 20:33:33 2017
@@ -42,17 +42,5 @@ function s${SEQNUM}_deleteFieldMapping(i
   eval("editjob.s${SEQNUM}_fieldmapping_op_"+i+".value=\"Continue\"");
 }
 
-function s${SEQNUM}_tikaTypeChanged(tikaServer)
-{
-	var elements = document.getElementsByClassName("hiddenParam");
-	for(var i=0; i < elements.length; i++) {
-		if(tikaServer.value == 'false') {
-			elements[i].style.visibility = 'hidden';
-		} else {
-			elements[i].style.visibility = 'visible';
-		}
-	}
-}
-
 //-->
 </script>

Copied: manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/viewConfiguration.html
(from r1794808, manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/viewSpecification.html)
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/viewConfiguration.html?p2=manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/viewConfiguration.html&p1=manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/viewSpecification.html&r1=1794808&r2=1794890&rev=1794890&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/viewSpecification.html
(original)
+++ manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/viewConfiguration.html
Thu May 11 20:33:33 2017
@@ -16,102 +16,12 @@
 -->
 
 <table class="displaytable">
-	<tr>
-	<tr>
-		<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaType'))</nobr></td>
-		#if($TIKASERVER == 'true')
-		<td class="value"><nobr>$ResourceBundle.getString('TikaExtractor.TikaServerSelected')</nobr></td>
-		#else
-		<td class="value"><nobr>$ResourceBundle.getString('TikaExtractor.TikaParsersSelected')</nobr></td>
-		#end
-	</tr>
-	#if($TIKASERVER == 'true')
-	<tr>
-		<td class="separator" colspan="2"><hr /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaHostname'))</nobr></td>
-		<td class="value"><nobr>$Encoder.bodyEscape($TIKAHOSTNAME)</nobr></td>
-	</tr>
-	<tr>
-		<td class="separator" colspan="2"><hr /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaPort'))</nobr></td>
-		<td class="value"><nobr>$Encoder.bodyEscape($TIKAPORT)</nobr></td>
-	</tr>
-	<tr>
-		<td class="separator" colspan="2"><hr /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaRetry'))</nobr></td>
-		<td class="value"><nobr>$Encoder.bodyEscape($TIKARETRY)</nobr></td>
-	</tr>
-	#end
-	<tr>
-		<td class="separator" colspan="2"><hr /></td>
-	</tr>
-	<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.FieldMappings'))</nobr></td>
-	<td class="boxcell">
-		<table class="formtable">
-			<tr class="formheaderrow">
-				<td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.MetadataFieldName'))</nobr></td>
-				<td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.FinalFieldName'))</nobr></td>
-			</tr>
-			#set($fieldcounter = 0) #foreach($fieldmapping in $FIELDMAPPINGS)
-			#if(($fieldcounter % 2) == 0)
-			<tr class="evenformrow">#else
-			<tr class="oddformrow">
-				#end
-				<td class="formcolumncell"><nobr>$Encoder.bodyEscape($fieldmapping.get('SOURCE'))</nobr>
-				</td>
-				<td class="formcolumncell"><nobr>$Encoder.bodyEscape($fieldmapping.get('TARGETDISPLAY'))</nobr>
-				</td>
-			</tr>
-			#set($fieldcounter = $fieldcounter + 1) #end #if($fieldcounter == 0)
-			<tr class="formrow">
-				<td class="formmessage" colspan="2">$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.NoFieldMappingSpecified'))</td>
-			</tr>
-			#end
-		</table>
-	</td>
-	</tr>
-	<tr>
-		<td class="separator" colspan="2"><hr /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.KeepAllMetadata'))</nobr></td>
-		<td class="value"><nobr>$Encoder.bodyEscape($KEEPALLMETADATA)</nobr></td>
-	</tr>
-	<tr>
-		<td class="separator" colspan="2"><hr /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.LowerNames'))</nobr></td>
-		<td class="value"><nobr>$Encoder.bodyEscape($LOWERNAMES)</nobr></td>
-	</tr>
-	<tr>
-		<td class="separator" colspan="2"><hr /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.WriteLimit'))</nobr></td>
-		<td class="value"><nobr>$Encoder.bodyEscape($WRITELIMIT)</nobr></td>
-	</tr>
-	<tr>
-		<td class="separator" colspan="2"><hr /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.IgnoreTikaExceptions'))</nobr></td>
-		<td class="value"><nobr>$Encoder.bodyEscape($IGNORETIKAEXCEPTIONS)</nobr></td>
-	</tr>
-	<tr>
-		<td class="separator" colspan="2"><hr /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.BoilerplateExtractorColon'))</nobr></td>
-		<td class="value">#if ($BOILERPLATECLASSNAME == '') <nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.NoExtractionSelected'))</nobr>
-			#else <nobr>$Encoder.bodyEscape($BOILERPLATECLASSNAME)</nobr> #end
-		</td>
-	</tr>
-
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaHostname'))</nobr></td>
+    <td class="value"><nobr>$Encoder.bodyEscape($TIKAHOSTNAME)</nobr></td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaPort'))</nobr></td>
+    <td class="value"><nobr>$Encoder.bodyEscape($TIKAPORT)</nobr></td>
+  </tr>
 </table>

Modified: manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/viewSpecification.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/viewSpecification.html?rev=1794890&r1=1794889&r2=1794890&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/viewSpecification.html
(original)
+++ manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/viewSpecification.html
Thu May 11 20:33:33 2017
@@ -16,102 +16,55 @@
 -->
 
 <table class="displaytable">
-	<tr>
-	<tr>
-		<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaType'))</nobr></td>
-		#if($TIKASERVER == 'true')
-		<td class="value"><nobr>$ResourceBundle.getString('TikaExtractor.TikaServerSelected')</nobr></td>
-		#else
-		<td class="value"><nobr>$ResourceBundle.getString('TikaExtractor.TikaParsersSelected')</nobr></td>
-		#end
-	</tr>
-	#if($TIKASERVER == 'true')
-	<tr>
-		<td class="separator" colspan="2"><hr /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaHostname'))</nobr></td>
-		<td class="value"><nobr>$Encoder.bodyEscape($TIKAHOSTNAME)</nobr></td>
-	</tr>
-	<tr>
-		<td class="separator" colspan="2"><hr /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaPort'))</nobr></td>
-		<td class="value"><nobr>$Encoder.bodyEscape($TIKAPORT)</nobr></td>
-	</tr>
-	<tr>
-		<td class="separator" colspan="2"><hr /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.TikaRetry'))</nobr></td>
-		<td class="value"><nobr>$Encoder.bodyEscape($TIKARETRY)</nobr></td>
-	</tr>
-	#end
-	<tr>
-		<td class="separator" colspan="2"><hr /></td>
-	</tr>
-	<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.FieldMappings'))</nobr></td>
-	<td class="boxcell">
-		<table class="formtable">
-			<tr class="formheaderrow">
-				<td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.MetadataFieldName'))</nobr></td>
-				<td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.FinalFieldName'))</nobr></td>
-			</tr>
-			#set($fieldcounter = 0) #foreach($fieldmapping in $FIELDMAPPINGS)
-			#if(($fieldcounter % 2) == 0)
-			<tr class="evenformrow">#else
-			<tr class="oddformrow">
-				#end
-				<td class="formcolumncell"><nobr>$Encoder.bodyEscape($fieldmapping.get('SOURCE'))</nobr>
-				</td>
-				<td class="formcolumncell"><nobr>$Encoder.bodyEscape($fieldmapping.get('TARGETDISPLAY'))</nobr>
-				</td>
-			</tr>
-			#set($fieldcounter = $fieldcounter + 1) #end #if($fieldcounter == 0)
-			<tr class="formrow">
-				<td class="formmessage" colspan="2">$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.NoFieldMappingSpecified'))</td>
-			</tr>
-			#end
-		</table>
-	</td>
-	</tr>
-	<tr>
-		<td class="separator" colspan="2"><hr /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.KeepAllMetadata'))</nobr></td>
-		<td class="value"><nobr>$Encoder.bodyEscape($KEEPALLMETADATA)</nobr></td>
-	</tr>
-	<tr>
-		<td class="separator" colspan="2"><hr /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.LowerNames'))</nobr></td>
-		<td class="value"><nobr>$Encoder.bodyEscape($LOWERNAMES)</nobr></td>
-	</tr>
-	<tr>
-		<td class="separator" colspan="2"><hr /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.WriteLimit'))</nobr></td>
-		<td class="value"><nobr>$Encoder.bodyEscape($WRITELIMIT)</nobr></td>
-	</tr>
-	<tr>
-		<td class="separator" colspan="2"><hr /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.IgnoreTikaExceptions'))</nobr></td>
-		<td class="value"><nobr>$Encoder.bodyEscape($IGNORETIKAEXCEPTIONS)</nobr></td>
-	</tr>
-	<tr>
-		<td class="separator" colspan="2"><hr /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.BoilerplateExtractorColon'))</nobr></td>
-		<td class="value">#if ($BOILERPLATECLASSNAME == '') <nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.NoExtractionSelected'))</nobr>
-			#else <nobr>$Encoder.bodyEscape($BOILERPLATECLASSNAME)</nobr> #end
-		</td>
-	</tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.FieldMappings'))</nobr></td>
+    <td class="boxcell">
+      <table class="formtable">
+        <tr class="formheaderrow">
+          <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.MetadataFieldName'))</nobr></td>
+          <td class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.FinalFieldName'))</nobr></td>
+        </tr>
+#set($fieldcounter = 0)
+#foreach($fieldmapping in $FIELDMAPPINGS)
+  #if(($fieldcounter % 2) == 0)
+        <tr class="evenformrow">
+  #else
+        <tr class="oddformrow">
+  #end
+          <td class="formcolumncell">
+            <nobr>$Encoder.bodyEscape($fieldmapping.get('SOURCE'))</nobr>
+          </td>
+          <td class="formcolumncell">
+            <nobr>$Encoder.bodyEscape($fieldmapping.get('TARGETDISPLAY'))</nobr>
+          </td>
+        </tr>
+  #set($fieldcounter = $fieldcounter + 1)
+#end
+#if($fieldcounter == 0)
+        <tr class="formrow"><td class="formmessage" colspan="2">$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.NoFieldMappingSpecified'))</td></tr>
+#end
+      </table>
+    </td>
+  </tr>
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.KeepAllMetadata'))</nobr></td>
+    <td class="value"><nobr>$Encoder.bodyEscape($KEEPALLMETADATA)</nobr></td>
+  </tr>
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.LowerNames'))</nobr></td>
+    <td class="value"><nobr>$Encoder.bodyEscape($LOWERNAMES)</nobr></td>
+  </tr>
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.WriteLimit'))</nobr></td>
+    <td class="value"><nobr>$Encoder.bodyEscape($WRITELIMIT)</nobr></td>
+  </tr>
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.IgnoreTikaExceptions'))</nobr></td>
+    <td class="value"><nobr>$Encoder.bodyEscape($IGNORETIKAEXCEPTIONS)</nobr></td>
+  </tr>
 
 </table>



Mime
View raw message