diff sv/main/EasaierSessionManager.cpp @ 257:057856cf81a2

reformat the InfoWidget and integrate the related media query

--- a/sv/main/EasaierSessionManager.cpp	Tue Jun 17 11:59:02 2008 +0000
+++ b/sv/main/EasaierSessionManager.cpp	Wed Jun 18 10:38:39 2008 +0000
@@ -84,9 +84,9 @@
 	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;
 }
@@ -112,9 +112,9 @@
 	
 	//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;
 }
@@ -349,17 +349,17 @@
 		}
 		case LoadedFile::RELATED_MEDIA_LIST :
 		{
-			std::list<QString> relMediaList;
-			SparqlRelatedMediaReader reader(&relMediaList);
+			m_relMediaList.clear();
+			SparqlRelatedMediaReader reader(&m_relMediaList);
 			read = reader.parse(filename);
-			importRelatedMedia(&relMediaList);
+			importRelatedMedia(&m_relMediaList);
 			break;
 		}
 		case LoadedFile::RELATED_MEDIA :
 		{
 			read = true;
 			RelatedMediaWidget* relMediaWidget = MainWindow::instance()->getRelatedMediaWidget();
-			relMediaWidget->addRelatedMedia(filename);
+			relMediaWidget->addRelatedMedia(filename, m_relMediaList);
 			break;
 		}
 		default: break;
@@ -497,15 +497,16 @@
 	m_currentPane = pane;
 }
 
-void EasaierSessionManager::importRelatedMedia(std::list<QString> *relMediaList)
+void EasaierSessionManager::importRelatedMedia(std::map<QString, QString> *relMediaList)
 {
 	QString filename;
 	QString query;
 
-	std::list<QString>::iterator iter;
+	std::map<QString, QString>::iterator iter;
 	for (iter = relMediaList->begin(); iter != relMediaList->end(); iter++)
 	{
-		filename = *iter;
+		filename = iter->first;
+		filename.remove("file:");
 
 		query = m_httpClient->getServletName() + "?theme=getFile&fileName=" + filename;