Changeset 3836


Ignore:
Timestamp:
03/19/08 12:41:20 (12 years ago)
Author:
melissa
Message:

Fixed a few file name mapping bugs.

Location:
trunk/loci/formats/in
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/in/FV1000Reader.java

    r3801 r3836  
    208208 
    209209    in = new RandomAccessStream(id); 
    210     if (isOIB) poi = new POITools(id); 
     210    if (isOIB) poi = new POITools(Location.getMappedId(id)); 
    211211 
    212212    channelNames = new Vector(); 
     
    290290    } 
    291291 
    292     String path = new Location(oifName).getAbsoluteFile().getAbsolutePath(); 
    293     String filename = 
    294       isOIB ? path.substring(path.lastIndexOf(File.separator) + 1) : path; 
    295     path = isOIB ? "" : path.substring(0, path.lastIndexOf(File.separator) + 1); 
     292    String f = new Location(oifName).getAbsoluteFile().getAbsolutePath(); 
     293    String path = isOIB || !f.endsWith(oifName) ? "" : 
     294      f.substring(0, f.lastIndexOf(File.separator) + 1); 
    296295 
    297296    RandomAccessStream oif = null; 
    298297    try { 
    299       oif = getFile(filename.substring(0, filename.lastIndexOf(".")) + ".oif"); 
     298      oif = getFile(oifName); 
    300299    } 
    301300    catch (IOException e) { 
    302       oif = getFile(filename.substring(0, filename.lastIndexOf(".")) + ".OIF"); 
     301      oif = getFile(oifName.replaceAll(".oif", ".OIF")); 
    303302    } 
    304303 
     
    670669    f = f.replace('\\', File.separatorChar); 
    671670    f = f.replace('/', File.separatorChar); 
     671    if (!isOIB && path.equals("")) return f; 
    672672    return path + File.separator + f; 
    673673  } 
  • trunk/loci/formats/in/IPWReader.java

    r3789 r3836  
    152152 
    153153    in = new RandomAccessStream(id); 
    154     poi = new POITools(currentId); 
     154    poi = new POITools(Location.getMappedId(currentId)); 
    155155 
    156156    imageFiles = new Vector(); 
  • trunk/loci/formats/in/PCIReader.java

    r3705 r3836  
    8989    } 
    9090 
     91    s.close(); 
     92 
    9193    if (core.pixelType[0] == FormatTools.UINT16) { 
    9294      for (int i=0; i<buf.length; i+=2) { 
     
    130132    imageFiles = new Vector(); 
    131133 
    132     poi = new POITools(currentId); 
     134    poi = new POITools(Location.getMappedId(currentId)); 
    133135 
    134136    Vector allFiles = poi.getDocumentList(); 
  • trunk/loci/formats/in/ZeissZVIReader.java

    r3706 r3836  
    262262    exposureTime = new Vector(); 
    263263 
    264     poi = new POITools(id); 
     264    poi = new POITools(Location.getMappedId(id)); 
    265265 
    266266    Vector files = poi.getDocumentList(); 
Note: See TracChangeset for help on using the changeset viewer.