[Pkg-mozext-commits] [sage-extension] 29/39: feed checking fix

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag sage_1_1
in repository sage-extension.

commit c7c349b9c566c6a147fc8c54df39e2a7158dfe9a
Author: Peter Andrews <petea at jhu.edu>
Date:   Sat May 29 19:31:08 2004 +0000

    feed checking fix
---
 src/sage/content/createhtml.js    |  2 +-
 src/sage/content/sage.js          |  8 ++++++--
 src/sage/content/updatechecker.js | 24 +++++++++++++++---------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/sage/content/createhtml.js b/src/sage/content/createhtml.js
index 2884ef7..c3e68ba 100755
--- a/src/sage/content/createhtml.js
+++ b/src/sage/content/createhtml.js
@@ -82,7 +82,7 @@ var CreateHTML = {
 		htmlSource = htmlSource.replace("**HTMLTITLE**", feed.getTitle());
 		htmlSource = htmlSource.replace("**TITLE**", feed.getTitle());
 		htmlSource = htmlSource.replace("**LINK**", feed.getLink());
-		htmlSource = htmlSource.replace("**DESCRIPTION**", feed.getDescription() + feed.getLastPubDate().toLocaleString());
+		htmlSource = htmlSource.replace("**DESCRIPTION**", feed.getDescription());
 
 		var itemsSource = "";
 		for(var i = 0; i < feed.getItemCount(); i++) {
diff --git a/src/sage/content/sage.js b/src/sage/content/sage.js
index 85938ec..aa5ab10 100755
--- a/src/sage/content/sage.js
+++ b/src/sage/content/sage.js
@@ -27,8 +27,10 @@ var rssLoading = false;
 var sageFolderID = "";
 var enableTooltip = true;
 var popupTimeoutId=0;
+var aConsoleService
 
-function init(){
+
+function init() {
 	strRes = document.getElementById("strRes");
 	bookmarksTree = document.getElementById("bookmarksTree");
 	rssItemListBox = document.getElementById("rssItemListBox");
@@ -57,6 +59,8 @@ function init(){
 	FeedSearch.init();
 	toggleShowSearchBar();
 	toggleShowFeedItemList();
+
+  aConsoleService = Components.classes["@mozilla.org/consoleservice;1"].getService(Components.interfaces.nsIConsoleService);
 }
 
 
@@ -466,7 +470,7 @@ function httpGetResult(aResultCode) {
 		currentFeed = new Feed(responseXML);
 
 		if(lastResource.res) {
-			BMSVC.updateLastVisitedDate(lastResource.res, responseXML.characterSet);
+			BMSVC.updateLastVisitedDate(lastResource.url, responseXML.characterSet);
 			CommonFunc.setBMDSProperty(lastResource.res, CommonFunc.BM_DESCRIPTION, CommonFunc.STATUS_NO_UPDATE);
 		}
 		setStatusDone();
diff --git a/src/sage/content/updatechecker.js b/src/sage/content/updatechecker.js
index 4422f8e..2173de7 100755
--- a/src/sage/content/updatechecker.js
+++ b/src/sage/content/updatechecker.js
@@ -78,28 +78,34 @@ var UpdateChecker = {
 		var feed = new Feed(UpdateChecker.httpReq.responseXML);
 
 		if(feed.hasLastPubDate()) {
-			lastModified = feed.getLastPubDate().getTime() * 1000;
+			lastModified = feed.getLastPubDate().getTime();
 		} else {
 			try {
 				lastModified = UpdateChecker.httpReq.getResponseHeader("Last-modified");
-				lastModified = new Date(lastModified).getTime() * 1000;
+				lastModified = new Date(lastModified).getTime();
 			} catch(e) {}
 		}
 		
-		UpdateChecker.checkResult(true, lastModified);
+		UpdateChecker.checkResult(true, lastModified, feed);
 	},
 
-	checkResult: function(aSucceed, aLastModified) {
+	checkResult: function(aSucceed, aLastModified, feed) {
 		var name = CommonFunc.getBMDSProperty(this.lastResource, CommonFunc.BM_NAME);
 		var url = CommonFunc.getBMDSProperty(this.lastResource, CommonFunc.BM_URL);
 		var status = 0;
 
+		var lastVisit = CommonFunc.getBMDSProperty(this.lastResource, CommonFunc.BM_LAST_VISIT);
+		if(!lastVisit) {
+			lastVisit = 0;
+		} else {
+			lastVisit /= 1000;
+		}
+
+		//if(feed)
+		//	aConsoleService.logStringMessage(feed.getTitle() + " aLastModified: " + aLastModified + ", lastVisit: " + lastVisit);
+
 		if(aLastModified) {
-			var lastVisit = CommonFunc.getBMDSProperty(this.lastResource, CommonFunc.BM_LAST_VISIT);
-			if(!lastVisit) { lastVisit = 0; }
-	
-			var updated = (aLastModified > lastVisit);
-			if(updated) {
+			if(aLastModified > lastVisit) {
 				status = CommonFunc.STATUS_UPDATE;
 			} else {
 				status = CommonFunc.STATUS_NO_UPDATE;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/sage-extension.git