[pclasses-cvs] pclasses2/src/System Mime.cpp,1.3,1.4

[stephan b. <sg...@us...>]

Update of /cvsroot/pclasses/pclasses2/src/System
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29164/src/System

Modified Files:
	Mime.cpp 
Log Message:
corrected fileext prob: was a broken op< in MimeType.

Index: Mime.cpp
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/System/Mime.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Mime.cpp	24 Dec 2004 03:24:55 -0000	1.3
+++ Mime.cpp	24 Dec 2004 04:06:35 -0000	1.4
@@ -51,15 +51,20 @@
 bool MimeType::operator<( const MimeType & rhs ) const
 {
 	if( &rhs == this ) return false;
-	return (m_mediaType < rhs.m_mediaType)
-		&& 
-		(m_subType < rhs.m_subType)
-		;
+	return this->mimeType() < rhs.mimeType();
+ 	if( m_mediaType < rhs.m_mediaType)
+ 	{
+		return true;
+ 	}
+ 	else if( m_mediaType == rhs.m_mediaType)
+ 	{
+		return (m_subType < rhs.m_subType);
+	}
+	return false;
 }
 
 bool MimeType::operator==( const MimeType & rhs ) const
 {
-	if( &rhs == this ) return true;
 	return (m_mediaType == rhs.m_mediaType)
 		&& 
 		(m_subType == rhs.m_subType)
@@ -115,7 +120,7 @@
 
 MimeType* MimeTypeDb::findByFileExt(const string& fileExt) const
 {
-	CERR << "findByFileExt() not yet implemented.\n";
+ 	CERR << "findByFileExt() not yet implemented.\n";
 	return 0;
 //   const MimeType* type = 0;
 //   MimeTypeMap::const_iterator i = m_types.begin();
@@ -208,22 +213,26 @@
 		strMediaType = line.substr(0,p1);
 		strSubType = line.substr(p1+1,p2-(p1+1));
 		rest = line.substr(p2+1,(line.size()-p2));
-// 		CERR << "media=["<<strMediaType<<"]\t p1="<<p1<<", p2="<<p2<<", subtype=["<<strSubType<<"]\t"
-// 		     << "rest=["<<rest<<"]\n";
+//  		CERR << "media=["<<strMediaType<<"]\t subtype=["<<strSubType<<"]\t"
+//  		     << "rest=["<<rest<<"]\n";
 		mimet = MimeType(strMediaType, strSubType);
 		db.typeMap().insert(make_pair(strMediaType, mimet ) );
 
 		std::istringstream istr(rest.c_str());
+		p1 = 0;
 		while( ! istr.eof() )
 		{
 			istr >> ext;
 			if( ! ext.empty() && ext[0] != '#' )
 			{
+				++p1;
 				db.extensionsMap().insert(make_pair(mimet, ext ) );
 			}
 			ext = "";
 		}
+		// CERR << "Mapped "<<p1<<" file extensions for "<<strMediaType<<" / " << strSubType<<"\n";
 	}
+	
 }
 
 void