Mercurial > hg > easaier-soundaccess

changeset 95:ca3a5912fd78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extract the servlet name and put it in HttpClient
author lbajardsilogic
date Thu, 05 Jul 2007 16:31:31 +0000
parents e9bc2730a7b5
children c70c6b99d871
files data/fileio/HttpClient.cpp data/fileio/HttpClient.h sv/main/EasaierSessionManager.cpp
diffstat 3 files changed, 21 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/data/fileio/HttpClient.cpp	Thu Jul 05 14:47:21 2007 +0000
+++ b/data/fileio/HttpClient.cpp	Thu Jul 05 16:31:31 2007 +0000
@@ -29,6 +29,8 @@
 	m_host = "";
 	m_hostPort = 0;
 
+	m_servletName = "/easaier/servlet/MOQueryServlet";
+
 	if (config->exists())
 	{
 		fromXmlString(config);
--- a/data/fileio/HttpClient.h	Thu Jul 05 14:47:21 2007 +0000
+++ b/data/fileio/HttpClient.h	Thu Jul 05 16:31:31 2007 +0000
@@ -40,6 +40,8 @@
 	inline QString getHost() const {return m_host;}
 	inline quint16 getHostPort() const {return m_hostPort;}
 
+	inline QString getServletName() const {return m_servletName;}
+
 	inline void setUseProxy(const bool& ok) { m_useProxy = ok;}
 	inline void setProxyInfo(const QString& proxy) { m_proxy = proxy;}
 	inline void setProxyPortInfo(const int& port) { m_proxyPort = port;}
@@ -64,6 +66,8 @@
 
 	QString		m_host;
 	quint16		m_hostPort;
+
+	QString		m_servletName;
 };
 
 
--- a/sv/main/EasaierSessionManager.cpp	Thu Jul 05 14:47:21 2007 +0000
+++ b/sv/main/EasaierSessionManager.cpp	Thu Jul 05 16:31:31 2007 +0000
@@ -56,7 +56,7 @@
 	closeSession();
 
 	m_queryModel = new QueryModel();
-	QString filename = "http://" + m_httpClient->getHost() + "/data/query/queryfield.xml";
+	QString filename = "/data/query/queryfield.xml";
 	QString query = "/data/query/queryfield.xml";
 
 	m_httpClient->setHost(m_httpClient->getHost());
@@ -75,10 +75,9 @@
 
 	QString params = "&identification=" + m_fileName;
 
-	QString query = "/easaier/servlet/MOQueryServlet?theme=infoFile"+params;
+	QString query = m_httpClient->getServletName() + "?theme=infoFile"+params;
 
-	QString filename = "http://"+ m_httpClient->getHost() + ":" + "9876" + 
-						"/easaier/servlet/infoFile";
+	QString filename = "/easaier/servlet/infoFile";
 	
 	m_httpClient->setHost(m_httpClient->getHost(), 9876);
 
@@ -96,10 +95,9 @@
 
 	QString params = "&identification=" + m_fileName;
 
-	QString query = "/easaier/servlet/MOQueryServlet?theme=infoFile"+params;
+	QString query = m_httpClient->getServletName() + "?theme=infoFile"+params;
 
-	QString filename = "http://"+ m_httpClient->getHost() + ":" + "9876" + 
-						"/easaier/servlet/infoFile";
+	QString filename = "/easaier/servlet/infoFile";
 	
 	m_httpClient->setHost(m_httpClient->getHost(), 9876);
 
@@ -144,10 +142,8 @@
 	if (m_httpClient->getHost() == "")
 		return;
 
-	QUrl url(filename);
-	QString path = url.path();
-	QString directory = path.left(path.lastIndexOf("/"));
-	QString file = path.right(path.length() - path.lastIndexOf("/"));
+	QString directory = filename.left(filename.lastIndexOf("/"));
+	QString file = filename.right(filename.length() - filename.lastIndexOf("/"));
 
 	if (directory.left(1) == "/")
 	{
@@ -164,7 +160,7 @@
 
 	int index = m_httpClient->get(query, newFile);
 
-	std::cerr << "Ask for file : GET " << path.toStdString() << " - index : " << index << std::endl;
+	std::cerr << "Ask for file : GET " << query.toStdString() << " - index : " << index << std::endl;
 
 	m_loadFile[index] = newFile;
 
@@ -319,8 +315,8 @@
 		{
 			QString uri = m_audioSourceInfoModel->getInfo(modelName);
 			
-			QString filename = "http://" + m_httpClient->getHost() + uri;
-			
+			QString query = uri;
+
 			std::set<QString>::iterator iterModel = m_modelLoaded.find(uri);
 
 			m_httpClient->setHost(m_httpClient->getHost());
@@ -328,7 +324,7 @@
 			if (iterModel == m_modelLoaded.end())
 			{
 				m_modelLoaded.insert(uri);
-				loadFile(uri, filename, LoadedFile::MODEL);
+				loadFile(query, uri, LoadedFile::MODEL);
 			}
 		}
 	}
@@ -387,11 +383,11 @@
 
 void EasaierSessionManager::importMetadata(const QString& filename, Pane* pane)
 {
-	QString file = "http://" + m_httpClient->getHost() + filename;
+	QString query = filename;
 
 	m_httpClient->setHost(m_httpClient->getHost());
 
-	loadFile(filename, file, LoadedFile::METADATA);
+	loadFile( query, filename, LoadedFile::METADATA);
 
 	m_currentPane = pane;
 }
@@ -408,8 +404,8 @@
 		}
 	}
 	
-	QString query = "/easaier/servlet/MOQueryServlet?theme="+themeName+""+params;
-	QString filename = "http://"+ m_httpClient->getHost() + ":" + "9876" + "/easaier/servlet/"+themeName;
+	QString query = m_httpClient->getServletName() + "?theme="+themeName+""+params;
+	QString filename = "/easaier/servlet/"+themeName;
 
 	m_httpClient->setHost(m_httpClient->getHost(), 9876);