Changeset 1087

Show
Ignore:
Timestamp:
08/02/11 15:16:25 (22 months ago)
Author:
antonio.alves
Message:

working on opentrials xml upload

Location:
trunk/opentrials/repository
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/opentrials/repository/templates/repository/xml/xml_opentrials.xml

    r1084 r1087  
    106106        </recruitment> 
    107107 
    108         <study expanded_access_program="{{ object.expanded_access_program|default_if_none:null }}" 
     108        <study expanded_access_program="{{ object.expanded_access_program }}" 
    109109               number_of_arms="{{ object.number_of_arms }}"> 
    110110            <study_design>{{ object.study_design }}</study_design> 
    … …  
    121121            <primary_outcome value="{{ outcome.description }}"> 
    122122                {% for outcome_trans in outcome.translations %} 
    123                 <text_translation value="{{ outcome_trans.description }}" lang="{{ outcome_trans.language }}"></text_translation> 
     123                <outcome_translation value="{{ outcome_trans.description }}" lang="{{ outcome_trans.language }}"></outcome_translation> 
    124124                {% endfor %} 
    125125            </primary_outcome> 
    … …  
    129129            <secondary_outcome value="{{ outcome.description }}"> 
    130130                {% for outcome_trans in outcome.translations %} 
    131                 <text_translation value="{{ outcome_trans.description }}" lang="{{ outcome_trans.language }}"></text_translation> 
     131                <outcome_translation value="{{ outcome_trans.description }}" lang="{{ outcome_trans.language }}"></outcome_translation> 
    132132                {% endfor %} 
    133133            </secondary_outcome> 

  • trunk/opentrials/repository/xml/generate.py

    r930 r1087  
    4141def xml_opentrials(trial, persons, include_translations=True, **kwargs): 
    4242    """Generates an Opentrials XML for a given Clinical Trial and returns as string.""" 
    43  
    4443    for translation in trial.translations: 
    4544        translation['primary_outcomes'] = [] 

  • trunk/opentrials/repository/xml/opentrials.dtd

    r1082 r1087  
    163163        <!ELEMENT outcome_translation EMPTY> 
    164164            <!ATTLIST outcome_translation value CDATA #REQUIRED> 
     165            <!ATTLIST outcome_translation lang CDATA #REQUIRED> 
    165166 
    166167    <!-- formset 8/9 --> 

  • trunk/opentrials/repository/xml/validate.py

    r839 r1087  
    2121    else: 
    2222        tree = filename_or_xmltree 
    23      
    2423    valid = dtd.validate(tree) 
    2524 
    2625    if not valid: 
     26        print dtd.error_log.filter_from_errors() 
     27        import pdb; pdb.set_trace() 
    2728        raise InvalidOpenTrialsXML(dtd.error_log.filter_from_errors()) 
    2829