Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 14:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

FeedReader:

Browse source 
- Remove "sid=" from link
Moved stringToUpperCase and stringToLowerCase from rsinit.cc to util/rsstring.cc


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6029 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-12-22 21:01:45 +00:00
parent e66a9117e2
commit 0f26b85a88
4 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

39
plugins/FeedReader/services/p3FeedReaderThread.cc
View file

@ -863,29 +863,28 @@ RsFeedReaderErrorState p3FeedReaderThread::process(const RsFeedReaderFeed &feed,
xml.getChildText(node, "link", item->link);
}
long todo; // remove sid
// // remove sid=
// CString sLinkUpper = sLink;
// sLinkUpper.MakeUpper ();
// int nSIDStart = sLinkUpper.Find (TEXT("SID="));
// if (nSIDStart != -1) {
// int nSIDEnd1 = sLinkUpper.Find (TEXT(";"), nSIDStart);
// int nSIDEnd2 = sLinkUpper.Find (TEXT("#"), nSIDStart);
// remove sid=
std::string linkUpper;
stringToUpperCase(item->link, linkUpper);
std::string::size_type sidStart = linkUpper.find("SID=");
if (sidStart != std::string::npos) {
std::string::size_type sidEnd1 = linkUpper.find(";", sidStart);
std::string::size_type sidEnd2 = linkUpper.find("#", sidStart);
// if (nSIDEnd1 == -1) {
// nSIDEnd1 = sLinkUpper.GetLength ();
// }
// if (nSIDEnd2 == -1) {
// nSIDEnd2 = sLinkUpper.GetLength ();
// }
if (sidEnd1 == std::string::npos) {
sidEnd1 = linkUpper.size();
}
if (sidEnd2 == std::string::npos) {
sidEnd2 = linkUpper.size();
}
// if (nSIDStart > 0 && sLinkUpper [nSIDStart - 1] == '&') {
// nSIDStart--;
// }
if (sidStart > 0 && linkUpper[sidStart - 1] == '&') {
sidStart--;
}
// int nSIDEnd = min (nSIDEnd1, nSIDEnd2);
// sLink.Delete (nSIDStart, nSIDEnd - nSIDStart);
// }
std::string::size_type sidEnd = std::min(sidEnd1, sidEnd2);
item->link.erase(sidStart, sidEnd - sidStart);
}
xml.getChildText(node, "author", item->author);