manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1794914 - in /manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main: java/org/apache/manifoldcf/agents/transformation/tikaservice/ native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/ resources/org/...
Date Fri, 12 May 2017 03:26:19 GMT
Author: kwright
Date: Fri May 12 03:26:18 2017
New Revision: 1794914

URL: http://svn.apache.org/viewvc?rev=1794914&view=rev
Log:
Remove unused tab

Removed:
    manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification_Exceptions.html
Modified:
    manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tikaservice/TikaExtractor.java
    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/viewSpecification.html

Modified: manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tikaservice/TikaExtractor.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tikaservice/TikaExtractor.java?rev=1794914&r1=1794913&r2=1794914&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tikaservice/TikaExtractor.java
(original)
+++ manifoldcf/branches/CONNECTORS-1425/connectors/tikaservice/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tikaservice/TikaExtractor.java
Fri May 12 03:26:18 2017
@@ -70,7 +70,6 @@ public class TikaExtractor extends org.a
   private static final String VIEW_CONFIGURATION_HTML = "viewConfiguration.html";
   private static final String EDIT_SPECIFICATION_JS = "editSpecification.js";
   private static final String EDIT_SPECIFICATION_FIELDMAPPING_HTML = "editSpecification_FieldMapping.html";
-  private static final String EDIT_SPECIFICATION_EXCEPTIONS_HTML = "editSpecification_Exceptions.html";
   private static final String VIEW_SPECIFICATION_HTML = "viewSpecification.html";
 
   protected static final String ACTIVITY_EXTRACT = "extract";
@@ -658,14 +657,13 @@ public class TikaExtractor extends org.a
               resultCode = "TIKASERVERREJECTS";
               description = "Tika Server rejected document with the following reason: "
                   + response.getStatusLine().getReasonPhrase();
-              handleTikaServerRejects(description);
+              return handleTikaServerRejects(description);
             } else {
               resultCode = "TIKASERVERERROR";
               description = "Tika Server failed to parse document with the following error:
"
                   + response.getStatusLine().getReasonPhrase();
-              handleTikaServerError(description);
+              return handleTikaServerError(description);
             }
-            return DOCUMENTSTATUS_REJECTED;
           }
 
         } catch (IOException | ParseException e) {
@@ -794,11 +792,9 @@ public class TikaExtractor extends org.a
     paramMap.put("SEQNUM", Integer.toString(connectionSequenceNumber));
 
     tabsArray.add(Messages.getString(locale, "TikaExtractor.FieldMappingTabName"));
-    tabsArray.add(Messages.getString(locale, "TikaExtractor.ExceptionsTabName"));
 
     // Fill in the specification header map, using data from all tabs.
     fillInFieldMappingSpecificationMap(paramMap, os);
-    fillInExceptionsSpecificationMap(paramMap, os);
 
     Messages.outputResourceWithVelocity(out, locale, EDIT_SPECIFICATION_JS, paramMap);
   }
@@ -836,10 +832,8 @@ public class TikaExtractor extends org.a
 
     // Fill in the field mapping tab data
     fillInFieldMappingSpecificationMap(paramMap, os);
-    fillInExceptionsSpecificationMap(paramMap, os);
 
     Messages.outputResourceWithVelocity(out, locale, EDIT_SPECIFICATION_FIELDMAPPING_HTML,
paramMap);
-    Messages.outputResourceWithVelocity(out, locale, EDIT_SPECIFICATION_EXCEPTIONS_HTML,
paramMap);
   }
 
   /**
@@ -942,25 +936,6 @@ public class TikaExtractor extends org.a
       os.addChild(os.getChildCount(), node3);
     }
 
-    if (variableContext.getParameter(seqPrefix + "ignoretikaexceptions_present") != null)
{
-      int i = 0;
-      while (i < os.getChildCount()) {
-        SpecificationNode node = os.getChild(i);
-        if (node.getType().equals(TikaConfig.NODE_IGNORETIKAEXCEPTION))
-          os.removeChild(i);
-        else
-          i++;
-      }
-
-      String value = variableContext.getParameter(seqPrefix + "ignoretikaexceptions");
-      if (value == null)
-        value = "false";
-
-      SpecificationNode node = new SpecificationNode(TikaConfig.NODE_IGNORETIKAEXCEPTION);
-      node.setAttribute(TikaConfig.ATTRIBUTE_VALUE, value);
-      os.addChild(os.getChildCount(), node);
-    }
-
     return null;
   }
 
@@ -987,7 +962,6 @@ public class TikaExtractor extends org.a
 
     // Fill in the map with data from all tabs
     fillInFieldMappingSpecificationMap(paramMap, os);
-    fillInExceptionsSpecificationMap(paramMap, os);
 
     Messages.outputResourceWithVelocity(out, locale, VIEW_SPECIFICATION_HTML, paramMap);
 
@@ -1029,17 +1003,6 @@ public class TikaExtractor extends org.a
     paramMap.put("WRITELIMIT", writeLimitValue);
   }
 
-  protected static void fillInExceptionsSpecificationMap(Map<String, Object> paramMap,
Specification os) {
-    String ignoreTikaExceptions = "true";
-    for (int i = 0; i < os.getChildCount(); i++) {
-      SpecificationNode sn = os.getChild(i);
-      if (sn.getType().equals(TikaConfig.NODE_IGNORETIKAEXCEPTION)) {
-        ignoreTikaExceptions = sn.getAttributeValue(TikaConfig.ATTRIBUTE_VALUE);
-      }
-    }
-    paramMap.put("IGNORETIKAEXCEPTIONS", ignoreTikaExceptions);
-  }
-
   protected static int handleTikaServerRejects(String reason)
       throws IOException, ManifoldCFException, ServiceInterruption {
     // MHL - what does Tika throw if it gets an IOException reading the stream??
@@ -1201,7 +1164,6 @@ public class TikaExtractor extends org.a
     private final boolean keepAllMetadata;
     private final boolean lowerNames;
     private final int writeLimit;
-    private final boolean ignoreTikaException;
 
     public SpecPacker(Specification os) {
       boolean keepAllMetadata = true;
@@ -1232,15 +1194,11 @@ public class TikaExtractor extends org.a
             target = "";
           }
           sourceTargets.put(source, target);
-        } else if (sn.getType().equals(TikaConfig.NODE_IGNORETIKAEXCEPTION)) {
-          String value = sn.getAttributeValue(TikaConfig.ATTRIBUTE_VALUE);
-          ignoreTikaException = Boolean.parseBoolean(value);
         }
       }
       this.keepAllMetadata = keepAllMetadata;
       this.lowerNames = lowerNames;
       this.writeLimit = writeLimit;
-      this.ignoreTikaException = ignoreTikaException;
     }
 
     public String toPackedString() {
@@ -1282,11 +1240,6 @@ public class TikaExtractor extends org.a
         sb.append(writeLimit);
       }
 
-      if (ignoreTikaException)
-        sb.append('+');
-      else
-        sb.append('-');
-
       return sb.toString();
     }
 
@@ -1306,10 +1259,6 @@ public class TikaExtractor extends org.a
       return writeLimit;
     }
 
-    public boolean ignoreTikaException() {
-      return ignoreTikaException;
-    }
-
   }
 
 }

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=1794914&r1=1794913&r2=1794914&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 03:26:18 2017
@@ -17,7 +17,6 @@ TikaExtractor.TikaHostname=Tika hostname
 TikaExtractor.TikaPort=Tika port:
 TikaExtractor.TikaServerTabName=Tika server
 TikaExtractor.FieldMappingTabName=Field mapping
-TikaExtractor.ExceptionsTabName=Exceptions
 TikaExtractor.FieldMappings=Field mappings:
 TikaExtractor.MetadataFieldName=Metadata field name
 TikaExtractor.FinalFieldName=Final field name
@@ -30,4 +29,3 @@ TikaExtractor.AddFieldMapping=Add field
 TikaExtractor.Delete=Delete
 TikaExtractor.DeleteFieldMapping=Delete field mapping
 TikaExtractor.NoFieldNameSpecified=Please specify a field name
-TikaExtractor.IgnoreTikaExceptions=Ignore Tika exceptions:
\ No newline at end of file

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=1794914&r1=1794913&r2=1794914&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 03:26:18 2017
@@ -14,14 +14,6 @@
 # limitations under the License.
 
 TikaExtractor.FieldMappingTabName=Trazar un mapa de campaña
-TikaExtractor.ExceptionsTabName=excepciones
-TikaExtractor.NoExtractionSelected=-- Sin extracción seleccionado --
-TikaExtractor.ExtractArticles=Extracto de artículos
-TikaExtractor.ExtractArticleSentences=Extraer frases artículo
-TikaExtractor.BasicExtraction=Básica extracción de propósito general
-TikaExtractor.ExtractEverything=extraer todo
-TikaExtractor.ExtractLargestTextComponent=Extraiga el componente de texto más grande del
documento
-TikaExtractor.ExtractNumWords=Extraer función del número de palabras por bloque
 TikaExtractor.FieldMappings=asignaciones de campo:
 TikaExtractor.MetadataFieldName=Metadatos nombre del campo
 TikaExtractor.FinalFieldName=Nombre de campo final
@@ -34,7 +26,6 @@ TikaExtractor.AddFieldMapping=Añadir
 TikaExtractor.Delete=Borrar
 TikaExtractor.DeleteFieldMapping=Eliminar asignación de campos
 TikaExtractor.NoFieldNameSpecified=Por favor, especifique un nombre de campo
-TikaExtractor.IgnoreTikaExceptions=No haga caso de excepciones Tika:
 TikaExtractor.TikaHostname=Tika hostname:
 TikaExtractor.TikaPort=Tika port:
 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=1794914&r1=1794913&r2=1794914&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 03:26:18 2017
@@ -17,16 +17,6 @@ TikaExtractor.TikaHostname=Tika hostname
 TikaExtractor.TikaPort=Tika port:
 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
-TikaExtractor.BasicExtraction=Basic general-purpose extraction
-TikaExtractor.ExtractEverything=Extract everything
-TikaExtractor.ExtractLargestTextComponent=Extract the largest text component of the document
-TikaExtractor.ExtractNumWords=Extract based on number of words per block
 TikaExtractor.FieldMappings=フィールドマッピング:
 TikaExtractor.MetadataFieldName=メタデータフィールド名
 TikaExtractor.FinalFieldName=最後のフィールド名
@@ -39,4 +29,3 @@ TikaExtractor.AddFieldMapping=フã‚
 TikaExtractor.Delete=削除
 TikaExtractor.DeleteFieldMapping=フィールドマッピングを削除
 TikaExtractor.NoFieldNameSpecified=フィールド名を指定してください
-TikaExtractor.IgnoreTikaExceptions=Tika例外を無視してください:
\ No newline at end of file

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=1794914&r1=1794913&r2=1794914&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 03:26:18 2017
@@ -17,14 +17,6 @@ TikaExtractor.TikaHostname=Tika hostname
 TikaExtractor.TikaPort=Tika port:
 TikaExtractor.TikaServerTabName=Tika server
 TikaExtractor.FieldMappingTabName=字段映射
-TikaExtractor.ExceptionsTabName=异常
-TikaExtractor.NoExtractionSelected=-- No extraction selected --
-TikaExtractor.ExtractArticles=Extract articles
-TikaExtractor.ExtractArticleSentences=Extract article sentences
-TikaExtractor.BasicExtraction=Basic general-purpose extraction
-TikaExtractor.ExtractEverything=Extract everything
-TikaExtractor.ExtractLargestTextComponent=Extract the largest text component of the document
-TikaExtractor.ExtractNumWords=Extract based on number of words per block
 TikaExtractor.FieldMappings=字段映射:
 TikaExtractor.MetadataFieldName=元数据字段名
 TikaExtractor.FinalFieldName=最终字段名
@@ -37,4 +29,3 @@ TikaExtractor.AddFieldMapping=æ·»åŠ
 TikaExtractor.Delete=删除
 TikaExtractor.DeleteFieldMapping=删除字段映射
 TikaExtractor.NoFieldNameSpecified=未指定字段名
-TikaExtractor.IgnoreTikaExceptions=忽略Tika异常:
\ No newline at end of file

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=1794914&r1=1794913&r2=1794914&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
Fri May 12 03:26:18 2017
@@ -61,10 +61,5 @@
     <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