Changeset 3813


Ignore:
Timestamp:
03/13/08 14:44:20 (12 years ago)
Author:
curtis
Message:

Default to 2007-06, not 2003 (FC), for OME-XML output.

Location:
trunk/loci/formats
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/MetadataTools.java

    r3664 r3813  
    9292          // default to newest schema version 
    9393          r.exec("import ome.xml.OMEXMLFactory"); 
    94           //version = (String) r.exec("OMEXMLFactory.LATEST_VERSION"); 
    95           version = "2003-FC"; 
     94          version = (String) r.exec("OMEXMLFactory.LATEST_VERSION"); 
    9695        } 
    9796        else { 
  • trunk/loci/formats/in/OMEXMLReader.java

    r3809 r3813  
    8585  /* @see loci.formats.IFormatReader#isThisType(byte[]) */ 
    8686  public boolean isThisType(byte[] block) { 
    87     return new String(block, 0, 5).equals("<?xml"); 
     87    String xml = new String(block); 
     88    return xml.startsWith("<?xml") && xml.indexOf("<OME") >= 0; 
    8889  } 
    8990 
     
    192193      r.setVar("s", in.readString((int) in.length())); 
    193194      in.seek(0); 
    194       //r.exec("omexmlMeta = MetadataTools.createOMEXMLMetadata(s)"); 
    195       r.exec("omexmlMeta = MetadataTools.createOMEXMLMetadata()"); 
    196       r.exec("import org.openmicroscopy.xml.OMENode"); 
    197       r.exec("root = new OMENode(s)"); 
    198       r.exec("omexmlMeta.setRoot(root)"); 
     195      r.exec("omexmlMeta = MetadataTools.createOMEXMLMetadata(s)"); 
    199196    } 
    200197    catch (ReflectException exc) { 
  • trunk/loci/formats/tools/ImageInfo.java

    r3584 r3813  
    185185 
    186186    if (omexml) { 
    187       if (omexmlVersion == null) omexmlVersion = "2003-FC"; 
    188187      reader.setOriginalMetadataPopulated(true); 
    189188      MetadataStore store = 
Note: See TracChangeset for help on using the changeset viewer.