Changeset 6413


Ignore:
Timestamp:
08/04/15 12:01:42 (9 years ago)
Author:
davor.ostojic@oeaw.ac.at
Message:

merge problem fixed

File:
1 edited

Legend:

Unmodified
Added
Removed

  • vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java

    r6412 r6413  
    3838    @Override
    3939    public CMDIData process(File file) throws VTDException, IOException {
    40         final CMDIData cmdiData = new CMDIData();
    41         final VTDGen vg = new VTDGen();
    42         final FileInputStream fileInputStream = new FileInputStream(file);
    43         try {
    44             vg.setDoc(IOUtils.toByteArray(fileInputStream));
    45             vg.parse(true);
    46         } finally {
    47             fileInputStream.close();
    48         }
    49 
    50 <<<<<<< .working
     40        CMDIData cmdiData = new CMDIData();
     41        VTDGen vg = new VTDGen();
     42        FileInputStream fileInputStream = new FileInputStream(file);
     43        vg.setDoc(IOUtils.toByteArray(fileInputStream));
     44        vg.parse(true);
     45        fileInputStream.close();
     46
    5147        VTDNav nav = vg.getNav();
    5248        String profileId = extractXsd(nav.cloneNav());
    5349        cmdiData.setProfileId(profileId);
    5450        FacetMapping facetMapping = getFacetMapping(profileId);
    55 =======
    56         final VTDNav nav = vg.getNav();
    57         final FacetMapping facetMapping = getFacetMapping(nav.cloneNav());
    58 >>>>>>> .merge-right.r6411
    5951
    6052        if (facetMapping.getFacets().isEmpty()) {
Note: See TracChangeset for help on using the changeset viewer.