← Back to branch summary

~ubuntu-branches/ubuntu/utopic/ginkgocadx/utopic-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: 2012-01-29 12:02:54 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120129120254-nu7giync5p156icb
Tags: 2.8.0.4602-1
http://bugs.debian.org/657827
New upstream version (adapted patch, removed patch applied upstream)
Closes: #657827

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 4034 2011-07-21 09:44:05Z tovar $
 
3
 *  $Id: parserxmlenglish.cpp 4477 2011-12-13 11:16:56Z tovar $
4
4
 *  Ginkgo CADx Project
5
5
 *
6
6
 *  Copyright 2008-10 MetaEmotion S.L. All rights reserved.
217
217
                                                throw HL7XMLException(_Std("The pdu size is not a valid number"), xpp, "CONF/pacs");
218
218
                                        }
219
219
                                        if(wxString::FromUTF8(pacsServer.puerto.c_str()).ToLong(&puerto)) {
220
 
                                                DicomServerList::Instance()->AddServer( DicomServer(pacsServer.sid, pacsServer.AET, pacsServer.hostname, (int)puerto, 0, true, pdu, pacsServer.tls, pacsServer.user, pacsServer.password, pacsServer.metodo == GIL::IModeloPACSServer::IMPS_MOVE, wxString::FromUTF8(pacsServer.retrieveLevel.c_str()).Upper() == wxT("SERIES"), pacsServer.verify, pacsServer.cert, pacsServer.key), true );
 
220
                                                DicomServerList::Instance()->AddServer( DicomServer(pacsServer.sid, pacsServer.AET, pacsServer.hostname, (int)puerto, 0, true, pdu, pacsServer.tls, pacsServer.user, pacsServer.password, pacsServer.metodo == GIL::IModeloPACSServer::IMPS_MOVE, wxString::FromUTF8(pacsServer.retrieveLevel.c_str()).Upper() == wxT("SERIES"), false, pacsServer.verify, pacsServer.cert, pacsServer.key), true );
221
221
                                        } else {
222
222
                                                throw HL7XMLException(_Std("The port is not a valid number"), xpp, "CONF/pacs");
223
223
                                        }
279
279
                else if (propVal.CmpNoCase(wxT("print")) == 0) {
280
280
                        modelo->accion = GIL::IModeloIntegracion::TA_Imprimir;
281
281
                }
 
282
                else if (propVal.CmpNoCase(wxT("open")) == 0) {
 
283
                        modelo->accion = GIL::IModeloIntegracion::TA_Open;
 
284
                }
282
285
                else {
283
286
                        throw HL7XMLException(_Std("\"action\" attribute invalid at \"gnkworkflow\" scope" ), xpp, "CONF/template");
284
287
                }
325
328
 
326
329
        //recorremos los hijos de las gnkworkflows
327
330
        for (wxXmlNode* hijo = nodo->GetChildren(); hijo != NULL; hijo = hijo->GetNext()) {
 
331
                //files...
 
332
                if (hijo->GetName().CmpNoCase(wxT("file")) == 0 && hijo->GetChildren() != NULL){
 
333
                        modelo->Files.push_back(std::string(hijo->GetChildren()->GetContent().ToUTF8()));
 
334
                }
328
335
                //parseamos los campos dimse
329
336
                if(hijo->GetName().CmpNoCase(wxT("query-retrieve-level")) == 0){
330
337
                        propVal = hijo->GetPropVal(wxT("value"), wxEmptyString);