engine/src/OpmlParser.cpp
changeset 109 223f270fa7ff
parent 103 520291e28460
child 117 3b59b88b089e
equal deleted inserted replaced
108:554d9980157f 109:223f270fa7ff
   128 					hasUrl = ETrue;			
   128 					hasUrl = ETrue;			
   129 				// htmlUrl
   129 				// htmlUrl
   130 				} else if (attr16.Compare(KTagHtmlUrl) == 0) {
   130 				} else if (attr16.Compare(KTagHtmlUrl) == 0) {
   131 					newFeed->SetLinkL(*val16);
   131 					newFeed->SetLinkL(*val16);
   132 					hasUrl = ETrue;
   132 					hasUrl = ETrue;
   133 				// text=...
   133 				// title=...
   134 				} else if (attr16.Compare(KTagTitle) == 0) {
   134 				} else if (attr16.Compare(KTagTitle) == 0) {
   135 					newFeed->SetTitleL(*val16);
   135 					newFeed->SetTitleL(*val16);
   136 					newFeed->SetCustomTitle();
       
   137 					hasTitle = ETrue;
   136 					hasTitle = ETrue;
   138 				// description=
   137 				// description=
   139 				} else if (attr16.Compare(KTagDescription) == 0) {
   138 				} else if (attr16.Compare(KTagDescription) == 0) {
   140 					newFeed->SetDescriptionL(*val16);
   139 					newFeed->SetDescriptionL(*val16);
       
   140 				// text=
   141 				} else if (attr16.Compare(KTagText) == 0) {
   141 				} else if (attr16.Compare(KTagText) == 0) {
   142 					if (!hasTitle) {
   142 					if (!hasTitle) {
   143 						newFeed->SetTitleL(*val16);
   143 						newFeed->SetTitleL(*val16);
   144 						newFeed->SetCustomTitle();
       
   145 						hasTitle = ETrue;
   144 						hasTitle = ETrue;
   146 					}
   145 					}
   147 				} 
   146 				} 
   148 				CleanupStack::PopAndDestroy(val16);
   147 				CleanupStack::PopAndDestroy(val16);
   149 			}
   148 			}
   152 				break;
   151 				break;
   153 			}
   152 			}
   154 			
   153 			
   155 			if (!hasTitle) {
   154 			if (!hasTitle) {
   156 				newFeed->SetTitleL(newFeed->Url());
   155 				newFeed->SetTitleL(newFeed->Url());
       
   156 			}
       
   157 			
       
   158 			// if the title is the same as the URL, it is hardly a custom
       
   159 			// title, so let's replace it on update
       
   160 			if (newFeed->Title().Length() &&
       
   161 					newFeed->Url().Length() &&
       
   162 					newFeed->Title().Compare(newFeed->Url()) != 0) {
       
   163 				newFeed->SetCustomTitle();
   157 			}
   164 			}
   158 			
   165 			
   159 			if (iSearching) {
   166 			if (iSearching) {
   160 				iFeedEngine.AddSearchResultL(newFeed);
   167 				iFeedEngine.AddSearchResultL(newFeed);
   161 				CleanupStack::Pop(newFeed);
   168 				CleanupStack::Pop(newFeed);