Mercurial > hg > easaier-soundaccess
changeset 92:dd06af61a4ff
correct bug with port 80 and 9876
| author | lbajardsilogic |
|---|---|
| date | Fri, 29 Jun 2007 10:04:07 +0000 |
| parents | 8e0ba77ecdf4 |
| children | cb6320fd77cc |
| files | sv/main/EasaierSessionManager.cpp sv/main/EasaierSessionManager.h |
| diffstat | 2 files changed, 23 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/sv/main/EasaierSessionManager.cpp Thu Jun 28 17:40:46 2007 +0000 +++ b/sv/main/EasaierSessionManager.cpp Fri Jun 29 10:04:07 2007 +0000 @@ -57,7 +57,9 @@ m_queryModel = new QueryModel(); QString filename = "http://" + m_httpClient->getHost() + "/data/query/queryfield.xml"; - QString query = "http://" + m_httpClient->getHost() + "/data/query/queryfield.xml"; + QString query = "/data/query/queryfield.xml"; + + m_httpClient->setHost(m_httpClient->getHost()); loadFile(query, filename, LoadedFile::QUERY_CONFIG); @@ -73,13 +75,13 @@ QString params = "&identification=" + m_fileName; - QString query = "http://"+ m_httpClient->getHost() + ":" + QString::number(m_httpClient->getHostPort())+ - "/easaier/servlet/MOQueryServlet?theme=infoFile"+params; + QString query = "/easaier/servlet/MOQueryServlet?theme=infoFile"+params; - QString filename = "http://"+ m_httpClient->getHost() + ":" + QString::number(m_httpClient->getHostPort())+ + QString filename = "http://"+ m_httpClient->getHost() + ":" + "9876" + "/easaier/servlet/infoFile"; - + m_httpClient->setHost(m_httpClient->getHost(), 9876); + loadFile(query, filename, LoadedFile::AUDIO_SOURCE_INFO); return true; @@ -94,13 +96,13 @@ QString params = "&identification=" + m_fileName; - QString query = "http://"+ m_httpClient->getHost() + ":" + QString::number(m_httpClient->getHostPort())+ - "/easaier/servlet/MOQueryServlet?theme=infoFile"+params; + QString query = "/easaier/servlet/MOQueryServlet?theme=infoFile"+params; - QString filename = "http://"+ m_httpClient->getHost() + ":" + QString::number(m_httpClient->getHostPort())+ + QString filename = "http://"+ m_httpClient->getHost() + ":" + "9876" + "/easaier/servlet/infoFile"; - + m_httpClient->setHost(m_httpClient->getHost(), 9876); + loadFile(query, filename, LoadedFile::AUDIO_SOURCE_INFO); return true; @@ -317,15 +319,16 @@ { QString uri = m_audioSourceInfoModel->getInfo(modelName); - uri = "http://" + m_httpClient->getHost() + uri; - m_audioSourceInfoModel->addInfo(modelName, uri); + QString filename = "http://" + m_httpClient->getHost() + uri; std::set<QString>::iterator iterModel = m_modelLoaded.find(uri); + m_httpClient->setHost(m_httpClient->getHost()); + if (iterModel == m_modelLoaded.end()) { m_modelLoaded.insert(uri); - loadFile(uri, uri, LoadedFile::MODEL); + loadFile(uri, filename, LoadedFile::MODEL); } } } @@ -386,7 +389,9 @@ { QString file = "http://" + m_httpClient->getHost() + filename; - loadFile(file, file, LoadedFile::METADATA); + m_httpClient->setHost(m_httpClient->getHost()); + + loadFile(filename, file, LoadedFile::METADATA); m_currentPane = pane; } @@ -403,8 +408,10 @@ } } - QString query = "http://"+ m_httpClient->getHost() + ":" + QString::number(m_httpClient->getHostPort())+ "/easaier/servlet/MOQueryServlet?theme="+themeName+""+params; - QString filename = "http://"+ m_httpClient->getHost() + ":" + QString::number(m_httpClient->getHostPort())+ "/easaier/servlet/"+themeName; + QString query = "/easaier/servlet/MOQueryServlet?theme="+themeName+""+params; + QString filename = "http://"+ m_httpClient->getHost() + ":" + "9876" + "/easaier/servlet/"+themeName; + + m_httpClient->setHost(m_httpClient->getHost(), 9876); QApplication::setOverrideCursor( Qt::WaitCursor ); loadFile(query, filename, LoadedFile::QUERY_RESULTS);