# HG changeset patch
# User lbajardsilogic
# Date 1213114017 0
# Node ID c12986afc03c0759b98a3c08c27daa27cdb457bc
# Parent  56b913f1fd05dbd82c77e5f5c9f688d5762ab3cb
patch for the EasaierTB rdf storage format

diff -r 56b913f1fd05 -r c12986afc03c sv/main/EasaierSessionManager.cpp
--- 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);
 			}
 		}
diff -r 56b913f1fd05 -r c12986afc03c widgets/QueryResultsWidget.cpp
--- 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;
 				}