Changeset 1ce36f37 in sasview


Ignore:
Timestamp:
Dec 30, 2013 12:57:00 PM (10 years ago)
Author:
Jeff Krzywon <jeffery.krzywon@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
3f484b0
Parents:
be577e7
Message:

Fixing the file path issue in the Ubuntu build.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sans/dataloader/readers/cansas_reader.py

    r19b628f r1ce36f37  
    173173            if extension in self.ext or self.allow_all: 
    174174                base_name = xml_reader.__file__ 
    175                 base = base_name.split("\\sans\\")[0] 
     175                base_name = base_name.replace("\\","/") 
     176                base = base_name.split("/sans/")[0] 
    176177                 
    177178                # Load in the xml file and get the cansas version from the header 
     
    184185                # Generic values for the cansas file based on the version 
    185186                cansas_defaults = CANSAS_NS.get(self.cansasVersion, "1.0") 
    186                 schema_path = "{0}\\sans\\dataloader\\readers\\schema\\{1}".format(base, cansas_defaults.get("schema")).replace("\\", "/") 
     187                schema_path = "{0}/sans/dataloader/readers/schema/{1}".format(base, cansas_defaults.get("schema")).replace("\\", "/") 
    187188                 
    188189                # Link a schema to the XML file. 
Note: See TracChangeset for help on using the changeset viewer.