Mercurial > hg > easaier-soundaccess

changeset 250:c12986afc03c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch for the EasaierTB rdf storage format
author lbajardsilogic
date Tue, 10 Jun 2008 16:06:57 +0000
parents 56b913f1fd05
children 2ea04b3f9141
files sv/main/EasaierSessionManager.cpp widgets/QueryResultsWidget.cpp
diffstat 2 files changed, 27 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/sv/main/EasaierSessionManager.cpp	Tue Jun 10 07:59:55 2008 +0000
+++ b/sv/main/EasaierSessionManager.cpp	Tue Jun 10 16:06:57 2008 +0000
@@ -75,16 +75,18 @@
 	m_fileName = document->getAudioSourceInfoFileName();
 	m_document = document;
 
-	QString params = "&identification=" + m_fileName;
+	//QString params = "&identification=" + m_fileName;
+	QString params = "&signal=" + m_fileName;
 
-	QString query = m_httpClient->getServletName() + "?theme=infoFile"+params;
-	QString filename = "/easaier/servlet/infoFile";
+	//QString query = m_httpClient->getServletName() + "?theme=infoFile"+params;
+	QString query = m_httpClient->getServletName() + "?theme=musicBySignal"+params;
+	QString filename = "/easaier/servlet/musicBySignal";
 	loadFile(query, filename, LoadedFile::AUDIO_SOURCE_INFO);
 
 	//get related media
-	query = m_httpClient->getServletName() + "?theme=relatedMedia" + params;
+	/*query = m_httpClient->getServletName() + "?theme=relatedMedia" + params;
 	filename = "/easaier/servlet/relatedMedia";
-	loadFile(query, filename, LoadedFile::RELATED_MEDIA_LIST);
+	loadFile(query, filename, LoadedFile::RELATED_MEDIA_LIST);*/
 
 	return true;
 }
@@ -96,20 +98,23 @@
 	m_fileName = document->getAudioSourceInfoFileName();
 	m_document = document;
 
-	QString params = "&identification=" + m_fileName;
+	//QString params = "&identification=" + m_fileName;
+	QString params = "&signal=" + m_fileName;
 
 	//get infofile
-	QString query = m_httpClient->getServletName() + "?theme=infoFile" + params;
-
-	QString filename = "/easaier/servlet/infoFile";
-
+	//QString query = m_httpClient->getServletName() + "?theme=infoFile" + params;
+	QString query = m_httpClient->getServletName() + "?theme=musicBySignal" + params;
+	
+	//QString filename = "/easaier/servlet/infoFile";
+	QString filename = "/easaier/servlet/musicBySignal";
+	
 	loadFile(query, filename, LoadedFile::AUDIO_SOURCE_INFO);
 	
 	//get related media
 
-	query = m_httpClient->getServletName() + "?theme=relatedMedia" + params;
+	/*query = m_httpClient->getServletName() + "?theme=relatedMedia" + params;
 	filename = "/easaier/servlet/relatedMedia";
-	loadFile(query, filename, LoadedFile::RELATED_MEDIA_LIST);
+	loadFile(query, filename, LoadedFile::RELATED_MEDIA_LIST);*/
 
 	return true;
 }
@@ -161,6 +166,9 @@
 	if (directory.left(1) == "/")
 	{
 		directory.remove(0, 1);
+	}else if (directory.left(6) == "file:/")
+	{
+		directory.remove(0, 6);
 	}
 
 	//create the subdirectory in local
@@ -402,6 +410,8 @@
 		if (modelName != "")
 		{
 			QString uri = m_audioSourceInfoModel->getInfo(modelName)->at(0);
+			uri.remove("file:/");
+			uri.replace(".wma", ".mp3");
 			
 			QString query = m_httpClient->getServletName() + "?theme=getFile&fileName="+uri;
 
@@ -409,7 +419,7 @@
 
 			if (iterModel == m_modelLoaded.end())
 			{
-				m_modelLoaded.insert(uri);
+				m_modelLoaded.insert(uri);	
 				loadFile(query, uri, LoadedFile::MODEL);
 			}
 		}
--- a/widgets/QueryResultsWidget.cpp	Tue Jun 10 07:59:55 2008 +0000
+++ b/widgets/QueryResultsWidget.cpp	Tue Jun 10 16:06:57 2008 +0000
@@ -142,10 +142,12 @@
 		{
 			if ((*iterOnInfo).name != "signal")
 			{
-				if((*iterOnInfo).name == "composer"){
+				//if((*iterOnInfo).name == "composer"){
+				if((*iterOnInfo).name == "author"){
 					author = (*iterOnInfo).value;
 				}
-				if ((*iterOnInfo).name == "performance_title")
+				//if ((*iterOnInfo).name == "performance_title")
+				if ((*iterOnInfo).name == "title")
 				{
 					title += (*iterOnInfo).value;
 				}