Fix one index with multiple topic urls.

Author: gonwan

lib/libebook/ebook_chm.cpp

@@ -410,12 +410,11 @@ bool EBook_CHM::parseFileAndFillArray( const QString& file, QList< ParsedEntry >
 	}
 	*/
 
-	EBookTocEntry::Icon defaultimagenum = EBookTocEntry::IMAGE_AUTO;
 	int pos = 0, indent = 0, root_indent_offset = 0;
 	bool in_object = false, root_indent_offset_set = false;
 
 	ParsedEntry entry;
-	entry.iconid = defaultimagenum;
+	QMap< QString, ParsedEntry > indexNameEntryMap;
 
 	// Split the HHC file by HTML tags
 	int stringlen = src.length();
@@ -488,17 +487,22 @@ bool EBook_CHM::parseFileAndFillArray( const QString& file, QList< ParsedEntry >
 
 				// Trim the entry name
 				entry.name = entry.name.trimmed();
-
 				int real_indent = indent - root_indent_offset;
-
 				entry.indent = real_indent;
-				data.push_back( entry );
+
+				if ( !asIndex )
+					data.push_back( entry );
+				else
+				{
+					QMap< QString, ParsedEntry >::iterator it = indexNameEntryMap.find( entry.name );
+					if ( it == indexNameEntryMap.end() )
+						indexNameEntryMap[ entry.name ] = entry;
+					else
+						it.value().urls.append( entry.urls );
+				}
 			}
 
-			entry.name = QString();
-			entry.urls.clear();
-			entry.iconid = defaultimagenum;
-			entry.seealso.clear();
+			entry.clear();
 			in_object = false;
 		}
 		else if ( tagword == "param" && in_object )
@@ -536,7 +540,7 @@ bool EBook_CHM::parseFileAndFillArray( const QString& file, QList< ParsedEntry >
 			if ( pname == "name" || pname == "keyword" )
 			{
 				// Some help files contain duplicate names, where the second name is empty. Work it around by keeping the first one
-				if ( !pvalue.isEmpty() )
+				if ( !pvalue.isEmpty() && entry.name.isEmpty() )
 					entry.name = pvalue;
 			}
 			else if ( pname == "merge" )
@@ -602,6 +606,9 @@ bool EBook_CHM::parseFileAndFillArray( const QString& file, QList< ParsedEntry >
 		pos = i;
 	}
 
+	if ( asIndex )
+		data = indexNameEntryMap.values();
+
 	// Dump our array
 //    for ( int i = 0; i < data.size(); i++ )
 //        qDebug() << data[i].indent << data[i].name << data[i].urls;
@@ -940,8 +947,12 @@ void EBook_CHM::fillTopicsUrlMap()
 		unsigned int off_url = get_int32_le( ( unsigned int* )( topics.data() + i + 8 ) );
 		off_url = get_int32_le( ( unsigned int* )( urltbl.data() + off_url + 8 ) ) + 8;
 
-		QUrl url = pathToUrl( ( const char* ) urlstr.data() + off_url );
+		QUrl url = pathToUrl( encodeInternalWithCurrentCodec( ( const char* ) urlstr.data() + off_url ) );
 
+		/*
+		 * Titles are extracted from the <title> field from html pages when compling the chm file, try with text codec.
+		 * These values are used in index search and index with multiple topics selection currently.
+		 */
 		if ( off_title < ( unsigned int )strings.size() )
 			m_url2topics[url] = encodeWithCurrentCodec( ( const char* ) strings.data() + off_title );
 		else
@@ -1137,9 +1148,3 @@ QString EBook_CHM::urlToPath( const QUrl& link ) const
 
 	return "";
 }
-
-EBook_CHM::ParsedEntry::ParsedEntry()
-{
-	iconid = 0;
-	indent = 0;
-}

lib/libebook/ebook_chm.h

@@ -201,7 +201,19 @@ class EBook_CHM : public EBook
 		class ParsedEntry
 		{
 			public:
-				ParsedEntry();
+				ParsedEntry()
+				{
+					iconid = EBookTocEntry::IMAGE_AUTO;
+					indent = 0;
+				}
+				void clear()
+				{
+					name.clear();
+					urls.clear();
+					iconid = EBookTocEntry::IMAGE_AUTO;
+					indent = 0;
+					seealso.clear();
+				}
 
 				QString     name;
 				QList<QUrl> urls;

src/dialog_topicselector.ui

@@ -1,30 +1,31 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>DialogTopicSelector</class>
- <widget class="QDialog" name="DialogTopicSelector" >
-  <property name="geometry" >
+ <widget class="QDialog" name="DialogTopicSelector">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>218</width>
+    <width>360</width>
     <height>258</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Multiple topics</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
+  <layout class="QVBoxLayout">
+   <property name="margin">
     <number>9</number>
    </property>
-   <property name="spacing" >
+   <property name="spacing">
     <number>6</number>
    </property>
    <item>
-    <widget class="QLabel" name="label" >
-     <property name="text" >
+    <widget class="QLabel" name="label">
+     <property name="text">
       <string>Please select the topic to open:</string>
      </property>
-     <property name="alignment" >
+     <property name="alignment">
       <set>Qt::AlignCenter</set>
      </property>
     </widget>
@@ -33,11 +34,11 @@
     <widget class="QListWidget" name="list" />
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
      </property>
     </widget>
@@ -53,11 +54,11 @@
    <receiver>DialogTopicSelector</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>66</x>
      <y>330</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>-3</x>
      <y>275</y>
     </hint>
@@ -69,11 +70,11 @@
    <receiver>DialogTopicSelector</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>151</x>
      <y>327</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>277</x>
      <y>293</y>
     </hint>

src/tab_index.cpp

@@ -91,7 +91,7 @@ void TabIndex::onTextChanged( const QString& newvalue )
 	{
 		m_lastSelectedItem = items[0];
 		tree->setCurrentItem( m_lastSelectedItem );
-		tree->scrollToItem( m_lastSelectedItem );
+		tree->scrollToItem( m_lastSelectedItem, QAbstractItemView::PositionAtTop );
 	}
 	else
 		m_lastSelectedItem = 0;