Subversion Repositories tpanel

Rev

Rev 84 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 84 Rev 122
Line 45... Line 45...
45 
    TError::clear();
 45 
    TError::clear();
46 
    string fname = makeFileName(mPath, "prj.xma");
 46 
    string fname = makeFileName(mPath, "prj.xma");
47 
 
 47 
 
48 
    if (!isValidFile())
 48 
    if (!isValidFile())
49 
    {
 49 
    {
50 
        TTPInit init(TConfig::getProjectPath());
 - 
 
51 
 
 - 
 
52 
        if (!isValidFile())
 - 
 
53 
        {
 - 
 
54 
            MSG_ERROR("Error: File " << fname << " doesn't exist or can't be opened!");
 50 
        MSG_ERROR("Error: File " << fname << " doesn't exist or can't be opened!");
55 
            TError::setError();
 51 
        TError::setError();
56 
            return false;
 52 
        return false;
57 
        }
 - 
 
58 
    }
 53 
    }
59 
 
 54 
 
60 
    TExpat xml(fname);
 55 
    TExpat xml(fname);
61 
    xml.setEncoding(ENC_CP1250);
 56 
    xml.setEncoding(ENC_CP1250);
62 
 
 57 
 
Line 148... Line 143...
148 
    mSetup.voipCommandPort = xml.getElementInt("voipCommandPort", depth);
 143 
    mSetup.voipCommandPort = xml.getElementInt("voipCommandPort", depth);
149 
 
 144 
 
150 
    if ((index = xml.getElementIndex("resourceList", &depth)) == TExpat::npos)
 145 
    if ((index = xml.getElementIndex("resourceList", &depth)) == TExpat::npos)
151 
    {
 146 
    {
152 
        MSG_WARNING("Missing element \"resourceList\" in file!");
 147 
        MSG_WARNING("Missing element \"resourceList\" in file!");
153 
//        TError::setError();
 - 
 
154 
//        return false;
 - 
 
155 
    }
 148 
    }
156 
 
 149 
 
157 
    string name, content;
 150 
    string name, content;
158 
    vector<ATTRIBUTE_t> attrs;
 151 
    vector<ATTRIBUTE_t> attrs;
159 
 
 152