← Back to branch summary

~ubuntu-branches/ubuntu/raring/ginkgocadx/raring-proposed

« back to all changes in this revision

Viewing changes to src/cadxcore/main/controllers/parserxmlenglish.cpp

  • Committer: Package Import Robot
  • Author(s): Andreas Tille
  • Date: 2011-09-09 08:39:26 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: package-import@ubuntu.com-20110909083926-iktecd132cnku5cd
Tags: 2.5.4.0~rc-1
New upstream version (patches were applied)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cadxcore/main/controllers/parserxmlenglish.cpp
1
1
/*
2
2
 *  
3
 
 *  $Id: parserxmlenglish.cpp 3963 2011-07-11 14:03:51Z tovar $
 
3
 *  $Id: parserxmlenglish.cpp 4034 2011-07-21 09:44:05Z tovar $
4
4
 *  Ginkgo CADx Project
5
5
 *
6
6
 *  Copyright 2008-10 MetaEmotion S.L. All rights reserved.
232
232
                                models.push_back(modelo);
233
233
                        } //fin gnkworkflow
234
234
                } //fin de parseo de gnkworkflows
235
 
        } else if (pRoot->GetName().CmpNoCase(wxT("plantilla")) == 0) {
 
235
        } else if (pRoot->GetName().CmpNoCase(wxT("gnkworkflow")) == 0) {
236
236
                GIL::IModeloIntegracion* modelo = ParseGnkWorkflow(pRoot, servers);
237
237
                models.push_back(modelo);
238
238
        } else {
329
329
                if(hijo->GetName().CmpNoCase(wxT("query-retrieve-level")) == 0){
330
330
                        propVal = hijo->GetPropVal(wxT("value"), wxEmptyString);
331
331
                        if ( !propVal.empty() ) {
332
 
                                modelo->ambitoDIMSE = propVal.ToUTF8();
 
332
                                modelo->ambitoDIMSE = propVal.Upper().ToUTF8();
333
333
                        }
334
334
                        else {
335
335
                                throw HL7XMLException(_Std("\"value\" attribute expected at \"query-retrieve-level\" scope"), xpp, "CONF/template");
478
478
                modelo->Metadatos.push_back(IModeloTupla("DICOM","0010|0020", modelo->Paciente.GetIdentificadorPreferido().valor,""));
479
479
        }
480
480
        if (modelo->accion == GIL::IModeloIntegracion::TA_Dicomizar) {
481
 
                if (modelo->idPlantilla == "") {
482
 
                        throw HL7XMLException(_Std("\"tid\" attribute omitted"), xpp, "CONF/template");
483
 
                }
484
481
                if (modelo->idAmbitoPeticion == "") {
485
482
                        throw HL7XMLException(_Std("\"scope\" attribute expected at \"gnkworkflow\" scope"), xpp, "CONF/template");
486
483
                }