Changeset 6009


Ignore:
Timestamp:
03/09/10 15:30:53 (10 years ago)
Author:
melissa
Message:

Fixed bug that caused original metadata to be needlessly duplicated.

Location:
trunk/components/bio-formats/src/loci/formats/in
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/bio-formats/src/loci/formats/in/LIFReader.java

    r5627 r6009  
    338338 
    339339    xml = XMLTools.sanitizeXML(xml); 
    340     XMLTools.parseXML(xml, handler); 
     340    try { 
     341      XMLTools.parseXML(xml, handler); 
     342    } 
     343    catch (IOException e) { } 
    341344 
    342345    metadata = handler.getGlobalMetadata(); 
     
    389392      MetadataTools.setDefaultCreationDate(store, getCurrentFile(), i); 
    390393    } 
    391     XMLTools.parseXML(xml, new LeicaHandler(store)); 
     394    try { 
     395      XMLTools.parseXML(xml, new LeicaHandler(store)); 
     396    } 
     397    catch (IOException e) { } 
    392398  } 
    393399 
  • trunk/components/bio-formats/src/loci/formats/in/LeicaHandler.java

    r5951 r6009  
    233233    } 
    234234 
     235    int oldSeriesCount = numDatasets; 
    235236    Hashtable h = getSeriesHashtable(numDatasets); 
    236237    if (qName.equals("LDM_Block_Sequential_Master")) { 
     
    808809    } 
    809810    else count = 0; 
    810     storeSeriesHashtable(numDatasets, h); 
     811    if (numDatasets == oldSeriesCount) storeSeriesHashtable(numDatasets, h); 
    811812  } 
    812813 
Note: See TracChangeset for help on using the changeset viewer.