suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Zotero.Fulltext.getIndexedState() to return UNAVAILABLE instead of UNINDEXED if row in fulltextItems but no page counts

Browse Source
This commit is contained in:
Dan Stillman 2007-09-02 20:30:01 +00:00
parent 5ca4431ed2
commit ad5a93ae85
2 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chrome/content/zotero/overlay.js
View File

@ -880,7 +880,8 @@ var ZoteroPane = new function()
document.getElementById('zotero-attachment-view').setAttribute('label', str);
// Display page count
var pages = Zotero.Fulltext.getPages(item.ref.getID()).total;
var pages = Zotero.Fulltext.getPages(item.ref.getID());
var pages = pages ? pages.total : null;
var pagesRow = document.getElementById('zotero-attachment-pages');
if (pages) {
var str = Zotero.getString('itemFields.pages') + ': ' + pages;

64
chrome/content/zotero/xpcom/fulltext.js
View File

@ -620,8 +620,7 @@ Zotero.Fulltext = new function(){
function getPages(itemID, force) {
var sql = "SELECT indexedPages AS indexed, totalPages AS total "
+ "FROM fulltextItems WHERE itemID=?";
var result = Zotero.DB.rowQuery(sql, itemID);
return result ? result : { indexed: null, total: null };
return Zotero.DB.rowQuery(sql, itemID);
}
@ -651,8 +650,7 @@ Zotero.Fulltext = new function(){
function getChars(itemID) {
var sql = "SELECT indexedChars AS indexed, totalChars AS total "
+ "FROM fulltextItems WHERE itemID=?";
var result = Zotero.DB.rowQuery(sql, itemID);
return result ? result : { indexed: null, total: null };
return Zotero.DB.rowQuery(sql, itemID);
}
@ -712,48 +710,50 @@ Zotero.Fulltext = new function(){
// Use pages for PDFs
case 'application/pdf':
var pages = this.getPages(itemID);
var indexedPages = pages.indexed;
var totalPages = pages.total;
if (!totalPages) {
if (!indexedPages) {
var status = this.INDEX_STATE_UNINDEXED;
}
else {
if (pages) {
var indexedPages = pages.indexed;
var totalPages = pages.total;
if (!totalPages && !indexedPages) {
var status = this.INDEX_STATE_UNAVAILABLE;
}
}
else if (!indexedPages) {
var status = this.INDEX_STATE_UNINDEXED;
}
else if (indexedPages < totalPages) {
var status = this.INDEX_STATE_PARTIAL;
else if (!indexedPages) {
var status = this.INDEX_STATE_UNINDEXED;
}
else if (indexedPages < totalPages) {
var status = this.INDEX_STATE_PARTIAL;
}
else {
var status = this.INDEX_STATE_INDEXED;
}
}
else {
var status = this.INDEX_STATE_INDEXED;
var status = this.INDEX_STATE_UNINDEXED;
}
break;
// Use chars
default:
var chars = this.getChars(itemID);
var indexedChars = chars.indexed;
var totalChars = chars.total;
if (!totalChars) {
if (!indexedChars) {
var status = this.INDEX_STATE_UNINDEXED;
}
else {
if (chars) {
var indexedChars = chars.indexed;
var totalChars = chars.total;
if (!totalChars && !indexedChars) {
var status = this.INDEX_STATE_UNAVAILABLE;
}
}
else if (!indexedChars) {
var status = this.INDEX_STATE_UNINDEXED;
}
else if (indexedChars < totalChars) {
var status = this.INDEX_STATE_PARTIAL;
else if (!indexedChars) {
var status = this.INDEX_STATE_UNINDEXED;
}
else if (indexedChars < totalChars) {
var status = this.INDEX_STATE_PARTIAL;
}
else {
var status = this.INDEX_STATE_INDEXED;
}
}
else {
var status = this.INDEX_STATE_INDEXED;
var status = this.INDEX_STATE_UNINDEXED;
}
}
return status;