Changeset 287


Ignore:
Timestamp:
Mar 15, 2013 11:54:53 PM (6 years ago)
Author:
prjemian
Message:

fixes #25

Location:
1dwg/branches/v1.1
Files:
1 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • 1dwg/branches/v1.1/CHANGES.txt

    r284 r287  
    2626         
    2727        * cleanup XSLT and reduce to just one XSLT 
     28        * clean up the examples, remove unnecessary material 
     29        * remove the mediawiki directory, we are done with it now 
    2830 
    2931:v1.0: 
  • 1dwg/branches/v1.1/php/xmlWriter/index.php

    r87 r287  
    1111##### GLOBALS ##################################################################### 
    1212 
    13 $tool['titleStr'] = "canSAS1d/1.0 XML formatter"; 
     13$tool['titleStr'] = "cansas1d:1.1 XML formatter"; 
    1414$tool['svnid'] = "\$Id$"; 
    1515$tool['email'] = "jemian@anl.gov"; 
     
    1717$tool['postAction'] = 'index.php'; 
    1818$tool['surveillance_file'] = './www/surveillance.xml';  // chmod 666 
    19 $tool['meta,desc'] = "Formats SAS data in the cansas1d/1.0 XML data format."; 
     19$tool['meta,desc'] = "Formats SAS data in the cansas1d:1.1 XML data format."; 
    2020$tool['meta,keys'] = "small-angle scattering, data format"; 
    21 $tool['canSAS_URL'] = "http://www.smallangles.net/" 
    22         . "wgwiki/index.php/cansas1d_documentation"; 
     21$tool['canSAS_URL'] = "http://www.cansas.org/"; 
    2322 
    2423# here are the form variables and descriptions 
     
    178177        $a = addElement($doc, $p, 'a'); 
    179178        addAttribute($a, 'href', $tool['canSAS_URL']); 
    180         addText($doc, $a, 'cansas1d/1.0 standard'); 
     179        addText($doc, $a, 'cansas1d:1.1 standard'); 
    181180        addText($doc, $p,  
    182181                '.  The WWW form returns the data in the XML format.' 
     
    238237 
    239238        $xslt = $doc->createProcessingInstruction('xml-stylesheet',  
    240                 'type="text/xsl" href="cansasxml-html.xsl"'); 
     239                'type="text/xsl" href="cansas1d.xsl"'); 
    241240        $doc->appendChild($xslt); 
    242241 
    243         $root = $doc->createElementNS('cansas1d/1.0','SASroot'); 
     242        $root = $doc->createElementNS('cansas1d:1.1','SASroot'); 
    244243        $doc->appendChild($root); 
    245244        addComment($doc, $root, 'canSAS XML created by ' . $tool['titleStr']); 
    246245 
    247246        $xsi_url = 'http://www.w3.org/2001/XMLSchema-instance'; 
    248         $schemaLocation = 'cansas1d/1.0 ' 
    249            . 'http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd'; 
     247        $schemaLocation = 'cansas1d:1.1 ' 
     248           . 'http://www.cansas.org/svn/1dwg/trunk/cansas1d.xsd'; 
    250249        addAttribute($root, 'version', '1.0'); 
    251250        addAttribute($root, 'xmlns:xsi', $xsi_url); 
  • 1dwg/branches/v1.1/php/xmlWriter/www/style.xsl

    r74 r287  
    1111 
    1212Purpose: 
    13         This stylesheet is used to display the cansas1d/1.0 
     13        This stylesheet is used to display the cansas1d:1.1 
    1414        xmlWriter surveillance log.. 
    1515--> 
Note: See TracChangeset for help on using the changeset viewer.