FCL/sf/mw/browser: comparison bookmarksengine/browsercontentdll/src/browsercontentdll.cpp

equal deleted inserted replaced

-:016bf4557e2f
+:6637b4599484
 //Check if the table exists, create table only when it's empty
 QStringList tablelist = sqlDB.tables(QSql::Tables);
 if (tablelist.count() == 0) {
 QSqlQuery query(sqlDB);
 query.exec(
-"CREATE TABLE BookMarkTable (title VARCHAR(40) NOT NULL,url VARCHAR(100),adate VARCHAR(40),tags VARCHAR(40),rowindex INTEGER, domain VARCHAR(100),CONSTRAINT pk_BookMarkTable PRIMARY KEY(title))");
+"CREATE TABLE BookMarkTable (title VARCHAR NOT NULL,url VARCHAR,adate VARCHAR,tags VARCHAR,rowindex INTEGER, domain VARCHAR,CONSTRAINT pk_BookMarkTable PRIMARY KEY(title))");
 error=query.lastError();
 if (error.type() == QSqlError::NoError) {
-query.exec("CREATE TABLE HistoryTable (rowindex INTEGER  PRIMARY KEY, title VARCHAR(40) NOT NULL,url VARCHAR(100),adate VARCHAR(40),atime VARCHAR(40), domain VARCHAR(100))");
+query.exec("CREATE TABLE HistoryTable (rowindex INTEGER  PRIMARY KEY, pageTitle VARCHAR NOT NULL,url VARCHAR,domain VARCHAR, timestamp int)");
 error=query.lastError();
 }
 }
 if (error.type() == QSqlError::NoError) {
 }
 /**==============================================================
 * Description: adds the bookmark to the database
 ================================================================*/
-int BrowserContent::AddBookmark(
+int BrowserContent::addBookmark(
 BookmarkLeaf* BookmarkContent)
 {
 BOOKMARKSCLIENT_PRIVATEPTR(BrowserContent);
 QSqlError error;
 QString title =BookmarkContent->getTitle();
 }
 /**==============================================================
 * Description: deletes the requested bookmark
 ================================================================*/
-int BrowserContent::DeleteBookmark(QString atitle)
+int BrowserContent::deleteBookmark(QString atitle)
 {
 BOOKMARKSCLIENT_PRIVATEPTR(BrowserContent);
 QSqlError error;
 QString title = atitle;
 QSqlDatabase db = QSqlDatabase::database(priv->m_connectionName);
 /**==============================================================
 * Description: fetches Allbookmarks From database
 ================================================================*/
-QList<BookmarkLeaf*> BrowserContent::FetchAllBookmarks()
+QList<BookmarkLeaf*> BrowserContent::fetchAllBookmarks()
 {
 BOOKMARKSCLIENT_PRIVATEPTR(BrowserContent);
 QSqlDatabase db = QSqlDatabase::database(priv->m_connectionName);
 QList<BookmarkLeaf*> nodeslist;
 while (query.next()) {
 QString title = query.value(0).toString();
 if(title.contains("'", Qt::CaseInsensitive))
 title.replace(QString("'"), QString("&#39"));
 if(title.contains("\"", Qt::CaseInsensitive))
 title.replace(QString("\""), QString("&#34"));
 QString url = query.value(1).toString();
 if(url.contains("'", Qt::CaseInsensitive))
 url.replace(QString("'"), QString("&#39"));
 if(url.contains("\"", Qt::CaseInsensitive))
 /**==============================================================
 * Description: adds the bookmark to the database
 ================================================================*/
-int BrowserContent::AddHistory(
+int BrowserContent::addHistory(
 HistoryLeaf* HistoryContent)
 {
 BOOKMARKSCLIENT_PRIVATEPTR(BrowserContent);
 QSqlError error;
 QString title =HistoryContent->getTitle();
 QString url = HistoryContent->getUrl();
-QString adate =HistoryContent->getDate().toString("dd.MM.yyyy");
+QDateTime dt  = QDateTime::currentDateTime();
-QString atime = HistoryContent->getLastVisited().toString("h:mm ap");
+int timestamp = dt.toTime_t();
 QSqlDatabase db = QSqlDatabase::database(priv->m_connectionName);
 if (db.isOpen()) {
 QSqlQuery query(db);
-query.prepare("INSERT INTO HistoryTable (rowindex,title, url, adate, atime, domain) "
-"VALUES (NULL,:title, :url, :adate, :atime, :domain)");
+		query.prepare("INSERT INTO HistoryTable (rowindex,pageTitle, url, domain, timestamp) "
+"VALUES (NULL,:title, :url, :domain, :timestamp)");
 query.bindValue(":title",  QVariant(title));
 query.bindValue(":url",    QVariant(url));
-query.bindValue(":adate",  QVariant(adate));
-query.bindValue(":atime",  QVariant(atime));
 query.bindValue(":domain", QVariant(filterUrl(url)));
+		query.bindValue(":timestamp",  QVariant(timestamp));
 query.exec();
 error = query.lastError();
 }
 if (error.type() == QSqlError::NoError) {
 /**==============================================================
 * Description: fetches History From database
 ================================================================*/
-QList<HistoryLeaf*> BrowserContent::FetchHistory()
+QList<HistoryLeaf*> BrowserContent::fetchHistory()
 {
 BOOKMARKSCLIENT_PRIVATEPTR(BrowserContent);
 QSqlDatabase db = QSqlDatabase::database(priv->m_connectionName);
 QList<HistoryLeaf*> nodeslist;
 bool ok;
 if (dbopen) {
 QSqlQuery query(db);
-query.prepare("SELECT title,url,adate,atime,rowindex FROM HistoryTable ORDER BY rowindex");
+		query.prepare("SELECT pagetitle,url,rowindex,timestamp FROM HistoryTable ORDER BY timestamp ASC");
 query.exec();
 QSqlError error = query.lastError();
 while (query.next()) {
 QString title = query.value(0).toString();
 if(title.contains("\"", Qt::CaseInsensitive))
 title.replace(QString("\""), QString("&#34"));
 QString url = query.value(1).toString();
-QString date = query.value(2).toString();
+			int aIndex=query.value(2).toInt(&ok);
-QString time = query.value(3).toString();
+uint timest = query.value(3).toUInt();
-int aIndex=query.value(4).toInt(&ok);
+QDateTime dtime=QDateTime::fromTime_t ( timest );
-HistoryLeaf* node = new HistoryLeaf();
+QDate adate=dtime.date();
-QDate adate = QDate::fromString(date, "dd.MM.yyyy");
+QTime atime =dtime.time();
-QTime atime = QTime::fromString(time, "h:mm ap");
+			HistoryLeaf* node = new HistoryLeaf();
 node->setTitle(title);
 node->setUrl(url);
 node->setDate(adate);
 node->setLastVisited(atime);
-//            node->setTag(tag);
 node->setIndex(aIndex);
 nodeslist.append(node);
 }
 }
 return nodeslist;
 return atitle;
 }
 /**==============================================================
 * Description: Retrieves the bookmarks and sends it in serialized fashion
 ================================================================*/
-QString BrowserContent::FetchSerializedBookmarks()
+QString BrowserContent::fetchSerializedBookmarks()
 {
 BOOKMARKSCLIENT_PRIVATEPTR(BrowserContent);
 QSqlDatabase db = QSqlDatabase::database(priv->m_connectionName);
 bool dbopen = db.isOpen();
 while (query.next())
 {
 QString title = query.value(0).toString();
+	if(title.contains("'", Qt::CaseInsensitive))
+title.replace(QString("'"), QString("&#39"));
+if(title.contains("\"", Qt::CaseInsensitive))
+title.replace(QString("\""), QString("&#34"));
 QString url = query.value(1).toString();
+	if(url.contains("'", Qt::CaseInsensitive))
+url.replace(QString("'"), QString("&#39"));
+if(url.contains("\"", Qt::CaseInsensitive))
+url.replace(QString("\""), QString("&#34"));
 QString date = query.value(2).toString();
 QString tag = query.value(3).toString();
 int aIndex=query.value(4).toInt(&ok);
 bookmakrData.append("{");
 bookmakrData.append("\"title\": \"");
 }
 return bookmakrData;
 }
 /**==============================================================
 * Description: Retrieves the History and sends it in serialized fashion
 ================================================================*/
-void BrowserContent::FetchSerializedHistory(QVector<QString> &folderVector,QMap<QString,QString> &mymap)
+void BrowserContent::fetchSerializedHistory(QVector<QString> &folders,QMap<QString,QString> &historyData)
 {
 BOOKMARKSCLIENT_PRIVATEPTR(BrowserContent);
 QSqlDatabase db = QSqlDatabase::database(priv->m_connectionName);
 QList<HistoryLeaf*> nodeslist;
 int i=0;
 bool dbopen = db.isOpen();
 bool ok;
 QString history = "";
-if (dbopen)
+if (!dbopen) {
-{
+		return;
+	}
 QSqlQuery query(db);
-query.prepare("SELECT title,url,adate,atime,rowindex FROM HistoryTable ORDER BY rowindex");
+	query.prepare("SELECT pagetitle,url,rowindex,timestamp FROM HistoryTable ORDER BY timestamp ASC");
 query.exec();
 QSqlError error = query.lastError();
-QString prevtitle="";
 int len=query.numRowsAffected();
-static int count=1;
-while (query.next())
+	while (query.next()) {
-{
+QString title = query.value(0).toString();
-QString title = query.value(0).toString();
+		if(title.contains("\"", Qt::CaseInsensitive))
-QString url = query.value(1).toString();
+title.replace(QString("\""), QString("&#34"));
-QString date = query.value(2).toString();
-QString time = query.value(3).toString();
+		QString url = query.value(1).toString();
-int aIndex=query.value(4).toInt(&ok);
+uint timest = query.value(3).toUInt();
-HistoryLeaf* node = new HistoryLeaf();
+QDateTime dtime=QDateTime::fromTime_t ( timest );
-QDate adate = QDate::fromString(date, "dd.MM.yyyy");
+QDate adate=dtime.date();
-QTime atime = QTime::fromString(time, "h:mm ap");
+QTime atime =dtime.time();
+int aIndex=query.value(4).toInt(&ok);
-QString foldertitle=findFolderForDate(adate);
+		QDate currentDate = QDateTime::currentDateTime().date();
+int daysToCurrentDate = adate.daysTo(currentDate);
-if(folderVector.contains(foldertitle))
-{
+if(daysToCurrentDate < 0) {
-mymap[prevtitle].append("\"},");
+		     continue;
-}
+		}
-else
-{
+QString foldertitle = findFolderForDate(adate);
-folderVector.append(foldertitle);
-if(count>1)
+if(folders.contains(foldertitle)) {
-{
+		 historyData[foldertitle].append(",");
-mymap[prevtitle].append("\"}");
+} else  {
-mymap[prevtitle].append ("]");
+folders.append(foldertitle);
-mymap[foldertitle].append("[");
+historyData[foldertitle].append("[");
 }
-else
+historyData[foldertitle].append("{");
-{
+historyData[foldertitle].append("\"titleVal\": \"");
-mymap[foldertitle].append("[");
+historyData[foldertitle].append(title);
-}
+historyData[foldertitle].append("\", \"dateVal\": \"");
-count++;
+historyData[foldertitle].append(adate.toString("dd.MM.yyyy"));
+historyData[foldertitle].append("\", \"urlVal\": \"");
+historyData[foldertitle].append(url);
-}
+historyData[foldertitle].append("\", \"timeVal\": \"");
+historyData[foldertitle].append(atime.toString("h:mm ap"));
-prevtitle=foldertitle;
+	    historyData[foldertitle].append("\"}");
+}
-mymap[foldertitle].append("{");
+	for (int i = 0; i < folders.size(); ++i) {
-mymap[foldertitle].append("\"titleVal\": \"");
+	  historyData[folders[i]].append("]");
-mymap[foldertitle].append(title);
+	}
-mymap[foldertitle].append("\", \"dateVal\": \"");
+}
-mymap[foldertitle].append(adate.toString("dd.MM.yyyy"));
-mymap[foldertitle].append("\", \"urlVal\": \"");
-mymap[foldertitle].append(url);
-mymap[foldertitle].append("\", \"timeVal\": \"");
-mymap[foldertitle].append(atime.toString("h:mm ap"));
-}
-mymap[prevtitle].append("\"}");
-mymap[prevtitle].append ("]");
-}
-}
 /**==============================================================
 * Description: Retrieves the bookmark titles and sends it in serialized fashion
 ================================================================*/
-void BrowserContent::FetchAllBookmarkTitles(QVector<QString> &title)
+void BrowserContent::fetchAllBookmarkTitles(QVector<QString> &title)
 {
 BOOKMARKSCLIENT_PRIVATEPTR(BrowserContent);
 QSqlDatabase db = QSqlDatabase::database(priv->m_connectionName);
 bool dbopen = db.isOpen();
-bool ok;
 int i=0;
 if(dbopen)
 {
 return folder;
 }
 //Check if date to belongs to current week folder
 //Should disply the day for the current week
-if(daysToCurrentDate < 7  &&  currentDayOfWeek > nodeDayOfWeek ){
+if(daysToCurrentDate > 1 && daysToCurrentDate < 7  &&  currentDayOfWeek > nodeDayOfWeek ){
 QString folder = qtTrId("txt_browser_history_this_week");
 return folder;
 }
-if(dateInThisMonth(nodeDate)){
+if(daysToCurrentDate > 1 && dateInThisMonth(nodeDate)){
 QString folder = qtTrId("txt_browser_history_this_month");
 return folder;
 }
 QString folder = nodeDate.toString("dd.MM.yyyy");

changeset 4	6637b4599484
parent 2	016bf4557e2f
child 6	aecf83d556aa