Projects >> FreeEed >>e8490505a616ba274a1abef97054815fa1f17171

Chunk
Conflicting content
=======
        first = false;
    }

<<<<<<< HEAD
    private void processHtmlContent(MapWritable value, Metadata allMetadata) throws IOException {
        BytesWritable htmlBytesWritable = (BytesWritable) value.get(new Text(ParameterProcessing.NATIVE_AS_HTML_NAME));
        if (htmlBytesWritable != null) {
            String htmlNativeEntryName = ParameterProcessing.HTML_FOLDER + "/"
                    + UPIFormat.format(outputFileCount) + "_"
                    + new File(allMetadata.get(DocumentMetadataKeys.DOCUMENT_ORIGINAL_PATH)).getName()
                    + ".html";
            zipFileWriter.addBinaryFile(htmlNativeEntryName, htmlBytesWritable.getBytes(), htmlBytesWritable.getLength());
            logger.trace("Processing file: {}", htmlNativeEntryName);            
        }
        
        // get the list with other files part of the html output
        Text htmlFiles = (Text) value.get(new Text(ParameterProcessing.NATIVE_AS_HTML));
        if (htmlFiles != null) {
            String fileNames = htmlFiles.toString();
            String[] fileNamesArr = fileNames.split(",");
            for (String fileName : fileNamesArr) {
                String entry = ParameterProcessing.HTML_FOLDER + "/" + fileName;
                
                BytesWritable imageBytesWritable = (BytesWritable) value.get(
                        new Text(ParameterProcessing.NATIVE_AS_HTML + "_" + fileName));
                if (imageBytesWritable != null) {
                    zipFileWriter.addBinaryFile(entry, imageBytesWritable.getBytes(), imageBytesWritable.getLength());
                    logger.trace("Processing file: {}", entry);
                }
            }
        }
    }
    
>>>>>>> 6f759a69b428fe4b46ed1166172797a9218e839a
    @Override
    @SuppressWarnings("unchecked")
    protected void setup(Reducer.Context context)
Solution content
        first = false;
    }

    private void processHtmlContent(MapWritable value, Metadata allMetadata) throws IOException {
        BytesWritable htmlBytesWritable = (BytesWritable) value.get(new Text(ParameterProcessing.NATIVE_AS_HTML_NAME));
        if (htmlBytesWritable != null) {
            String htmlNativeEntryName = ParameterProcessing.HTML_FOLDER + "/"
                    + UPIFormat.format(outputFileCount) + "_"
                    + new File(allMetadata.get(DocumentMetadataKeys.DOCUMENT_ORIGINAL_PATH)).getName()
                    + ".html";
            zipFileWriter.addBinaryFile(htmlNativeEntryName, htmlBytesWritable.getBytes(), htmlBytesWritable.getLength());
            logger.trace("Processing file: {}", htmlNativeEntryName);            
        }
        
        // get the list with other files part of the html output
        Text htmlFiles = (Text) value.get(new Text(ParameterProcessing.NATIVE_AS_HTML));
        if (htmlFiles != null) {
            String fileNames = htmlFiles.toString();
            String[] fileNamesArr = fileNames.split(",");
            for (String fileName : fileNamesArr) {
                String entry = ParameterProcessing.HTML_FOLDER + "/" + fileName;
                
                BytesWritable imageBytesWritable = (BytesWritable) value.get(
                        new Text(ParameterProcessing.NATIVE_AS_HTML + "_" + fileName));
                if (imageBytesWritable != null) {
                    zipFileWriter.addBinaryFile(entry, imageBytesWritable.getBytes(), imageBytesWritable.getLength());
                    logger.trace("Processing file: {}", entry);
                }
            }
        }
    }
    
    @Override
    @SuppressWarnings("unchecked")
    protected void setup(Reducer.Context context)
File
Reduce.java
Developer's decision
Version 2
Kind of conflict
Method declaration