Changeset 262


Ignore:
Timestamp:
Nov 1, 2012 2:56:37 PM (7 years ago)
Author:
prjemian
Message:

fixes #20, fixes #27

Location:
1dwg/trunk
Files:
2 added
25 edited

Legend:

Unmodified
Added
Removed
  • 1dwg/trunk/1998spheres.xml

    r261 r262  
    44                xmlns="urn:cansas1d:1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://www.cansas.org/svn/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <!--  
  • 1dwg/trunk/CHANGES.txt

    r261 r262  
    11.. $Id$ 
     2 
     3.. _CHANGES: 
    24 
    35=============== 
     
    57=============== 
    68 
    7 2012-08-16  tagged version canSAS1d/1.1  (2012-10-31 need to retag) 
     9:v1.1: 
     10        2012-08-16, tagged version canSAS1d/1.1 
     11         
     12        2012-10-31, still some more changes, need to retag 
    813         
    914        * TRAC #17: wontfix: clean up rules 
     
    1621        * slight changes in documentation of units (Angstrom and Celsius) 
    1722 
    18 2009-05-12  tagged version canSAS1d/1.0 
     23:v1.0: 
     24        2009-05-12, tagged version canSAS1d/1.0 
  • 1dwg/trunk/GLASSYC_C4G8G9_no_TL.xml

    r261 r262  
    66                xmlns="urn:cansas1d:1.1" 
    77                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    8                 xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     8                xsi:schemaLocation="urn:cansas1d:1.1 http://www.cansas.org/svn/1dwg/trunk/cansas1d.xsd" 
    99                > 
    1010 <SASentry name="Workspace_2"> 
  • 1dwg/trunk/GLASSYC_C4G8G9_w_TL.xml

    r261 r262  
    66                xmlns="urn:cansas1d:1.1" 
    77                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    8                 xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     8                xsi:schemaLocation="urn:cansas1d:1.1 http://www.cansas.org/svn/1dwg/trunk/cansas1d.xsd" 
    99                > 
    1010 <SASentry name="Workspace_2"> 
  • 1dwg/trunk/W1W2.XML

    r261 r262  
    44                xmlns="urn:cansas1d:1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://www.cansas.org/svn/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <SASentry name="W1"> 
  • 1dwg/trunk/bimodal-test1.xml

    r261 r262  
    44                xmlns="urn:cansas1d:1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://www.cansas.org/svn/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <SASentry> 
  • 1dwg/trunk/cansas1d-template.xml

    r261 r262  
    44                xmlns="urn:cansas1d:1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://www.cansas.org/svn/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <!-- 
  • 1dwg/trunk/cansas1d.xml

    r261 r262  
    44                xmlns="urn:cansas1d:1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://www.cansas.org/svn/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <SASentry> 
  • 1dwg/trunk/cs_af1410.xml

    r261 r262  
    44                xmlns="urn:cansas1d:1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://www.cansas.org/svn/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88  <SASentry name="AF1410:10"> 
  • 1dwg/trunk/cs_collagen.xml

    r261 r262  
    44                xmlns="urn:cansas1d:1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://www.cansas.org/svn/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <SASentry> 
  • 1dwg/trunk/cs_collagen_full.xml

    r261 r262  
    44                xmlns="urn:cansas1d:1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://www.cansas.org/svn/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <SASentry> 
  • 1dwg/trunk/doc/source/binding-fortran.rst

    r261 r262  
    4444        This update is expected to follow soon on the release of v1.1 
    4545 
    46 Steve King[mailto:s.m.king@rl.ac.uk] (ISIS) has provided a F77 routine  
     46Steve King[mailto:stephen.king@stfc.ac.uk] (ISIS) has provided a F77 routine  
    4747that will read cansas1d/1.0 XML files. 
    4848 
    49 http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/fortran/SASXML_G77.F  
     49http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/fortran/SASXML_G77.F  
  • 1dwg/trunk/doc/source/binding-igorpro.rst

    r261 r262  
    3737 
    3838**file** 
    39         http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/IgorPro/cansasXML.ipf 
     39        http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/IgorPro/cansasXML.ipf 
    4040 
    4141**author** 
     
    5454**URL** 
    5555        *TRAC* 
    56                 http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/IgorPro/cansasXML.ipf 
     56                http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/IgorPro/cansasXML.ipf 
    5757        *SVN* 
    58                 http://svn.cansas.org/svn/canSAS/1dwg/trunk/IgorPro/cansasXML.ipf 
     58                http://www.cansas.org/svn/1dwg/trunk/IgorPro/cansasXML.ipf 
    5959 
    6060.. index:: ! IgorPro package; XMLutils XOP 
     
    123123        .. code-block:: text 
    124124         
    125                 svn checkout http://svn.cansas.org/svn/canSAS/1dwg/trunk cansas-1dwg 
     125                svn checkout http://www.cansas.org/svn/1dwg/trunk cansas-1dwg 
    126126 
    127127This will download lots of extra files. The file of interest is in the 
     
    147147#. Download *cansasXML.ipf*. Either checkout from subversion (see above) or, with 
    148148        a web browser, copy *cansasXML.ipf* from the on-line subversion repository. 
    149         (http://svn.cansas.org/svn/canSAS/1dwg/trunk/IgorPro/cansasXML.ipf) 
     149        (http://www.cansas.org/svn/1dwg/trunk/IgorPro/cansasXML.ipf) 
    150150#. Copy *cansasXML.ipf* file to *...WavemetricsIgor Pro FolderUser Procedures* 
    151151        (or file system equivalent) 
  • 1dwg/trunk/doc/source/binding-java-jaxb.rst

    r261 r262  
    1212from Sun (see below for more on JAXB) using the *cansas1d.xsd* :index:`XML Schema`. 
    1313Resources (JAR files and documentation) for the Java binding may be found in 
    14 the canSAS subversion repository: http://svn.cansas.org/svn/canSAS/1dwg/tags/v1.0/java 
     14the canSAS subversion repository: http://www.cansas.org/svn/1dwg/tags/v1.0/java 
    1515 
    1616Subversion repository 
    17         http://svn.cansas.org/svn/canSAS/1dwg/tags/v1.0/java 
     17        http://www.cansas.org/svn/1dwg/tags/v1.0/java 
    1818         
    1919        canSAS subversion repository tagged release directory for the Java binding. 
     
    2121 
    2222*cansas1d-1.0.jar* 
    23         http://svn.cansas.org/svn/canSAS/1dwg/tags/v1.0/java/cansas1d-1.0.jar 
     23        http://www.cansas.org/svn/1dwg/tags/v1.0/java/cansas1d-1.0.jar 
    2424         
    2525        JAR file to add to your CLASSPATH in order to use this binding. 
    2626 
    2727*cansas1d-1.0-javadoc.jar* 
    28         http://svn.cansas.org/svn/canSAS/1dwg/tags/v1.0/java/cansas1d-1.0-javadoc.jar 
     28        http://www.cansas.org/svn/1dwg/tags/v1.0/java/cansas1d-1.0-javadoc.jar 
    2929         
    3030        Use this JAR file if you want to add the  
     
    3636 
    3737*cansas1d-1.0-sources.jar* 
    38         http://svn.cansas.org/svn/canSAS/1dwg/tags/v1.0/java/cansas1d-1.0-sources.jar 
     38        http://www.cansas.org/svn/1dwg/tags/v1.0/java/cansas1d-1.0-sources.jar 
    3939         
    4040        JAR file of the source code.    
     
    4545 
    4646*cansas1d-1.0.pdf* 
    47         http://svn.cansas.org/svn/canSAS/1dwg/tags/v1.0/java/cansas1d-1.0.pdf 
     47        http://www.cansas.org/svn/1dwg/tags/v1.0/java/cansas1d-1.0.pdf 
    4848 
    4949        PDF file of the javadoc source code documentation. 
     
    5151 
    5252source code (for developers) 
    53         http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/java/maven/eclipse 
     53        http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/java/maven/eclipse 
    5454         
    5555        canSAS Development project subversion repository for the Java binding.   
     
    6363to show how to read a cansas1d/1.1 XML file using the Java API.  
    6464 
    65 http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/java/maven/eclipse/src/main/java/org/scatteringsw/reader/Example_canSAS_Reader.java 
     65http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/java/maven/eclipse/src/main/java/org/scatteringsw/reader/Example_canSAS_Reader.java 
    6666 
    6767In short, these are the important two lines: 
     
    103103directory (above). By default, it shows the two samples in the 
    104104*1998spheres.xml* example file. 
    105 (http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/1998spheres.xml) 
     105(http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/1998spheres.xml) 
    106106 
    107107.. note:: The reader will have to get the directory paths  
     
    145145 
    146146Since the source code is rather lengthy, download it from: 
    147 http://svn.cansas.org/svn/canSAS/1dwg/trunk/doc/src/GetSASdata.java 
     147http://www.cansas.org/svn/1dwg/trunk/doc/src/GetSASdata.java 
    148148 
    149149.. 
  • 1dwg/trunk/doc/source/casestudy_af1410.rst

    r261 r262  
    1212 
    1313data file: *cs_af1410.xml* 
    14         http://svn.cansas.org/svn/canSAS/1dwg/trunk/examples/af1410/cs_af1410.xml 
     14        http://www.cansas.org/svn/1dwg/trunk/examples/af1410/cs_af1410.xml 
    1515 
    1616The data file contains multiple :ref:`SASentry` elements that pertain to different samples 
  • 1dwg/trunk/doc/source/casestudy_collagen.rst

    r261 r262  
    3838                raw data file 
    3939                 
    40                 http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/examples/collagen/COLLAGEN.ASC 
     40                http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/examples/collagen/COLLAGEN.ASC 
    4141 
    4242                .. rubric:: The header lines from *collagen.asc*: 
     
    5353                raw data file 
    5454                 
    55                 http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/examples/collagen/collagen.saxs 
     55                http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/examples/collagen/collagen.saxs 
    5656         
    5757                .. rubric:: The header lines from *collagen.saxs*: 
     
    7979It is easiest to copy a template rather than start from an empty file. Copy the 
    8080:download:`cansas1d.xml <../../cansas1d.xml>` file  
    81 (http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xml) 
     81(http://www.cansas.org/svn/1dwg/trunk/cansas1d.xml) 
    8282into your working directory and rename it to  
    8383*collagen.xml*. 
     
    154154can be viewed through the TRAC repository: 
    155155 
    156         http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/cs_collagen_full.xml 
     156        http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/cs_collagen_full.xml 
    157157 
    158158Validate the file 
     
    169169All files are available at: 
    170170 
    171         http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/examples/collagen/ 
     171        http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/examples/collagen/ 
  • 1dwg/trunk/doc/source/downloads.rst

    r261 r262  
    77========= 
    88 
    9 .. note:: This page could use improvement! 
     9.. note:: See :ref:`CHANGES` history below 
    1010 
    11 Version 1.0 
     11:Version 1.1: 
     12        released !imminent! including changes indicated on the TRAC site.  
     13        Tickets closed: 17, 18, 20, 21, 22. 
     14         
     15        See http://www.cansas.org/trac/report/6?sort=ticket&asc=1 
     16         
     17        :: 
     18         
     19                svn checkout http://www.cansas.org/svn/1dwg/tags/v1.1 cansas1dwg-1.1 
     20 
     21Older Releases 
     22================ 
     23 
     24:Version 1.0: 
    1225        released 2009-05-12 as no changes were committed since January 2009.  
    1326        Use this command to checkout the tagged release:: 
    1427 
    15                 svn checkout http://svn.cansas.org/svn/canSAS/1dwg/tags/v1.0 cansas1dwg-1.0 
     28                svn checkout http://www.cansas.org/svn/1dwg/tags/v1.0 cansas1dwg-1.0 
    1629 
    17 Version 1.1 
    18         released 2012-09-01 including changes indicated on the TRAC site.  
    19         Tickets closed: 17, 18, 20, 21, 22. 
    20          
    21         See http://svn.cansas.org/trac/canSAS/report/6?sort=ticket&asc=1 
    22          
    23         :: 
    24          
    25                 svn checkout http://svn.cansas.org/svn/canSAS/1dwg/tags/v1.1 cansas1dwg-1.1 
     30.. include:: ../../CHANGES.txt 
  • 1dwg/trunk/doc/source/element_XML_header.rst

    r261 r262  
    2424                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    2525                        xsi:schemaLocation="urn:cansas1d:1.1  
    26                                             http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd"> 
    27  
     26                                            http://www.cansas.org/svn/1dwg/trunk/cansas1d.xsd"> 
    2827 
    2928 
     
    6463       space (a newline is acceptable).   
    6564       The first string is the XML namespace,  
    66        repeated from above.  The second string is a suggested name 
    67        of the XML Schema file.  Some XML support libraries  
     65       repeated from above.  The second string is a suggested 
     66       name of the XML Schema file.  Some XML support libraries  
    6867       will follow the URL shown here to retrieve the 
    6968       XML Schema from the canSAS server.  Since this behavior  
    70        is not guaranteed by the XML standard, don't count on it. 
     69       is not guaranteed by the XML standard, don't count on  
     70       it. 
    7171====== ======================================================== 
  • 1dwg/trunk/doc/source/examples.rst

    r261 r262  
    3636single data point has been shown to more clearly show the other structure. 
    3737The data file is actually an excerpt from the *bimodal-test1.xml* 
    38 (http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/bimodal-test1.xml) 
     38(http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/bimodal-test1.xml) 
    3939example file in the main distribution. 
    4040 
     
    6363 
    6464The example data file *cansas1d.xml*  
    65 (http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xml) 
     65(http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xml) 
    6666shows examples 
    6767of most of the elements of the cansas1d/1.1 standard.  Only a single data  
  • 1dwg/trunk/doc/source/overview.rst

    r261 r262  
    9393                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    9494                xsi:schemaLocation="cansas1d/1.1 
    95                     http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     95                    http://www.cansas.org/svn/1dwg/trunk/cansas1d.xsd" 
    9696                > 
    9797 
     
    157157        successfully :ref:`validate <validate>` against the established XML Schema. 
    158158          
    159         http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd 
     159        http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd 
    160160#. :math:`Q=(4 \pi / \lambda) \sin(\theta)` 
    161161        where :math:`\lambda` is the wavelength of the radiation, 
     
    273273 
    274274The *cansas1d.xsd* :index:`XML Schema`  
    275 (http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd) 
     275(http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd) 
    276276defines the rules for the XML file format and is used to 
    277277validate any XML file for adherence to the format. 
     
    280280                (view source code highlighted by bug tracking system) 
    281281                 
    282                 http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd 
     282                http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd 
    283283 
    284284        SVN  
    285285                (view raw source code from version control system) 
    286286                 
    287                 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd 
     287                http://www.cansas.org/svn/1dwg/trunk/cansas1d.xsd 
    288288 
    289289XML stylesheets 
     
    294294or to convert into another file format. The 
    295295default canSAS stylesheet *cansasxml-html.xsl* 
    296 (http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansasxml-html.xsl) 
     296(http://www.cansas.org/svn/1dwg/trunk/cansasxml-html.xsl) 
    297297should be copied into each folder with canSAS XML data 
    298298file(s). It can be used to display the data in a supporting WWW browser 
     
    300300(with the added XML support in Excel).  
    301301 
    302 .. tip:: See the excellent write-up by Steve King, ISIS, for an example. 
    303  
    304         http://www.isis.rl.ac.uk/archive/LargeScale/LOQ/xml/cansas_xml_format.pdf 
     302.. Steve King suggests retiring this document since it has expired URLs. 
     303        The content is still good and may be a good addition to this document. 
     304        It is also moved to a new URL: 
     305         
     306                http://www.small-angle.ac.uk/small-angle/Formats/mainColumnParagraphs/00/text_files/file/New_canSAS_XML_Data_Format.pdf 
     307         
     308        I copied that locally to refs/New_canSAS_XML_Data_Format.pdf 
     309         
     310        .. tip:: See the excellent write-up by Steve King, ISIS, for an example. 
     311         
     312                http://www.isis.rl.ac.uk/archive/LargeScale/LOQ/xml/cansas_xml_format.pdf 
     313                 
    305314         
    306315 
     
    345354 
    346355**Basic example**  
    347         http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xml 
     356        http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xml 
    348357         
    349358    Note that, for clarity, only one row of data is 
     
    355364 
    356365**Bimodal test data** 
    357         http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/bimodal-test1.xml 
     366        http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/bimodal-test1.xml 
    358367 
    359368    Simulated SAS data (with added noise) calculated from model bimodal size  
     
    387396        sample), the files can be viewed from the TRAC site (no description yet). 
    388397         
    389         http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/examples/af1410/ 
     398        http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/examples/af1410/ 
    390399 
    391400.. index:: XML file; cansas1d-template.xml 
    392401 
    393402**Test all the cansas1d/1.1 rules** 
    394         http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d-template.xml 
     403        http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d-template.xml 
    395404         
    396405    The *cansas1d-template.xml* data file is used to test all the rules in the XML 
     
    424433        ISIS LOQ SANS instrument:  
    425434         
    426         http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/W1W2.XML 
     435        http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/W1W2.XML 
    427436 
    428437.. index:: XML file; cs_af1410.xml 
     
    431440        AF1410 steel SANS contrast variation study from NIST: 
    432441         
    433         http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/examples/af1410/cs_af1410.xml 
     442        http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/examples/af1410/cs_af1410.xml 
    434443         
    435444    SANS study using magnetic 
     
    453462 
    454463There is an example that demonstrates the use of a foreign namespace: 
    455 http://svn.cansas.org/trac/canSAS/browser/1dwg/data/Glassy%20Carbon/ISIS/GLASSYC_C4G8G9_withTL.xml 
     464http://www.cansas.org/trac/canSAS/browser/1dwg/data/Glassy%20Carbon/ISIS/GLASSYC_C4G8G9_withTL.xml 
    456465 
    457466This example uses a foreign namespace to record the transmission spectrum related to 
     
    465474 
    466475Also refer to canSAS TRAC ticket #47 
    467 (http://svn.cansas.org/trac/canSAS/changeset/47) 
     476(http://www.cansas.org/trac/canSAS/changeset/47) 
    468477for an example of arranging the content in  
    469478*SASprocessnote* to avoid the use of foreign namespace 
     
    503512**Microsoft Excel** 
    504513        Support for Microsoft Excel is provided through the default canSAS stylesheet, 
    505         *cansasxml-html.xsl* (http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansasxml-html.xsl). 
     514        *cansasxml-html.xsl* (http://www.cansas.org/svn/1dwg/trunk/cansasxml-html.xsl). 
    506515        The ISIS **LOQ** instrument (http://www.isis.stfc.ac.uk/instruments/loq/loq2470.html) 
    507516        has provided an excellent description of how to import data from the cansas1d/1.1 format into Excel. 
     
    529538        logging information is inserted into an XML file. 
    530539         
    531         PHP source: http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/php/xmlWriter/index.php 
     540        PHP source: http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/php/xmlWriter/index.php 
    532541 
    533542.. index:: 
     
    551560 
    552561TRAC (bug reporting) 
    553         http://svn.cansas.org/trac/canSAS/browser/1dwg/tags/v1.1 
     562        http://www.cansas.org/trac/canSAS/browser/1dwg/tags/v1.1 
    554563 
    555564SVN (*subversion* revision control system) 
    556         http://svn.cansas.org/svn/canSAS/1dwg/tags/v1.1 
     565        http://www.cansas.org/svn/1dwg/tags/v1.1 
  • 1dwg/trunk/doc/source/preface.rst

    r261 r262  
    5656However, should the information in this document and the  
    5757cansas1d/1.1 SAS XML Schema differ,  
    58 (http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd)  
     58(http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd)  
    5959the XML Schema will be deemed to have the most correct description of the standard. 
  • 1dwg/trunk/doc/source/specification.rst

    r261 r262  
    3131(including the use of closing tags).  [#]_ 
    3232Files that can be validated  against :ref:`cansas1d.xsd` 
    33 (http://svn.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd) 
     33(http://www.cansas.org/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd) 
    3434are deemed to be valid cansas1d/1.1 data files. 
    3535 
  • 1dwg/trunk/doc/source/validation.rst

    r261 r262  
    1818        and press ``<continue validation>`` 
    1919         
    20         (http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd) 
     20        (http://www.cansas.org/svn/1dwg/trunk/cansas1d.xsd) 
    2121#. check the results 
  • 1dwg/trunk/gc14-dls-i22.xml

    r261 r262  
    44                xmlns="urn:cansas1d:1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://www.cansas.org/svn/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <SASentry> 
  • 1dwg/trunk/s81-polyurea.xml

    r261 r262  
    44                xmlns="urn:cansas1d:1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="urn:cansas1d:1.1 http://svn.cansas.org/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="urn:cansas1d:1.1 http://www.cansas.org/svn/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88  <!--created by CS_XML_Indra.ipf--> 
Note: See TracChangeset for help on using the changeset viewer.