Minor tweaks and test updates

Author: aurimasv

Newsnetz.js

@@ -9,7 +9,7 @@
 	"inRepository": true,
 	"translatorType": 4,
 	"browserSupport": "gcs",
-	"lastUpdated": "2012-01-30 22:45:37"
+	"lastUpdated": "2012-03-05 04:49:07"
 }
 
 /*
@@ -56,25 +56,23 @@ function detectWeb(doc, url) {
 /* Zotero API */
 function doWeb(doc, url) {
 	//Zotero.debug("ibex doWeb URL= "+ url);
-	var urls = new Array();
 	if (detectWeb(doc, url) == "multiple") {
 		var items = Zotero.Utilities.getItemArray(doc, doc.getElementById("panelArticleItems").getElementsByTagName("h3"), '/story/\\d+');
 		if (!items || countObjectProperties(items) == 0) {
 			return true;
 		}
-		items = Zotero.selectItems(items);
-		if (!items) {
-			return true;
-		}
+		Zotero.selectItems(items, function(items) {
+			if (!items) return true;
 
-		for (var i in items) {
-			urls.push(i);
-		}
+			var urls = new Array();
+			for (var i in items) {
+				urls.push(i);
+			}
+			ZU.processDocuments(urls, scrape);
+		});
 	} else {
-		urls.push(doc.location.href);
+		scrape(doc);
 	}
-	Zotero.Utilities.processDocuments(urls, scrape, function() { Zotero.done(); } );
-	Zotero.wait();
 }
 
 function scrape(doc) {

TalisPrism.js

@@ -9,7 +9,7 @@
 	"inRepository": true,
 	"translatorType": 4,
 	"browserSupport": "gcs",
-	"lastUpdated": "2012-01-30 22:42:54"
+	"lastUpdated": "2012-03-05 04:46:31"
 }
 
 /* TalisPrism translator.
@@ -221,7 +221,8 @@ function scrape(doc, url, item){
 
 	if (publishing.match(/(13|14|15|16|17|18|19|20)\d\d/)) {
 		var pos = publishing.search(/(13|14|15|16|17|18|19|20)\d\d/);
-		item.date = publishing.substring(pos, publishing.lastIndexOf('.')).match(/\d\d\d\d/);
+		var date = publishing.substring(pos, publishing.lastIndexOf('.')).match(/\d\d\d\d/);
+		if(date) item.date = date[0];
 		var place = publishing.substring(0, publishing.indexOf(':'));
 		item.place = place.replace(/^\s+|\s+$/g, '');
 		var publisher = publishing.substring(publishing.indexOf(':')+1, pos); 
@@ -235,7 +236,8 @@ function scrape(doc, url, item){
 	}
 
 	isbn=isbn.replace(/^\D+|\D+$/g, "");	
-	item.ISBN = isbn.substring(0).match(/\d+/);
+	isbn = isbn.substring(0).match(/\d+/);
+	if(isbn) item.ISBN = isbn[0];
 
 	var series		  = getField(doc, 'Series');
 	var pos2 =series.lastIndexOf(';');
@@ -375,7 +377,6 @@ function doWeb(doc, url) {
 		if (prefix == "x" ) return namespace; else return null;
 	} : null;
 
-	var articles = new Array ();
 	var names = new Array ();
 	var items = new Object ();
 	var nextTitle;
@@ -408,29 +409,36 @@ function doWeb(doc, url) {
 			items[nextTitle.href] = nextTitle.textContent;
 			names.push(nextTitle.textContent);	
 		}
-		items = Zotero.selectItems(items);
-		for (var i in items) {
-			articles.push(i);
-		}
-		Zotero.Utilities.processDocuments(articles, multiscrape, function(){Zotero.done();});
-		
+		Zotero.selectItems(items, function(items) {
+			if(!items) return true;
+
+			var articles = new Array ();
+			for (var i in items) {
+				articles.push(i);
+			}
+			ZU.processDocuments(articles, function(doc) { multiscrape(doc, doc.location.href) });
+		});
 	} else if (doctype == "multiple") {
 		var titlePath = '//td[4]/font/span[@class="text"]/table/tbody/tr/td/font/span[@class="text"]/table/tbody/tr/td[1]/font/span[@class="text"]/a';
 		var titles = doc.evaluate(titlePath, doc, nsResolver, XPathResult.ANY_TYPE, null);
 		while (nextTitle = titles.iterateNext()) {
 			items[nextTitle.href] = nextTitle.textContent;
 			names.push(nextTitle.textContent);	
 		}
-		items = Zotero.selectItems(items);
-		for (var i in items) {
-			articles.push(i);
-		}
-		Zotero.Utilities.processDocuments(articles, multiscrape, function(){Zotero.done();});
+
+		Zotero.selectItems(items, function(items) {
+			if(!items) return true;
+
+			var articles = new Array ();
+			for (var i in items) {
+				articles.push(i);
+			}
+			ZU.processDocuments(articles, function(doc) { multiscrape(doc, doc.location.href) });
+		});
 	} 
 	else {
 		soloscrape(doc, url);
 	}
-	Zotero.wait();
 
 }/** BEGIN TEST CASES **/
 var testCases = [

Tatknigafund.js

@@ -9,7 +9,7 @@
 	"inRepository": true,
 	"translatorType": 4,
 	"browserSupport": "gcs",
-	"lastUpdated": "2012-01-30 22:42:48"
+	"lastUpdated": "2012-03-05 04:34:44"
 }
 
 /*
@@ -59,6 +59,44 @@
  in lieu of up-to-date translator documentation.
  */
 
+function scrape(doc, url) {
+	var n = doc.documentElement.namespaceURI;
+	var ns = n ? function(prefix) {
+		if (prefix == 'x') return n; else return null;
+	} : null;
+	
+	item = new Zotero.Item("book");
+	item.title = Zotero.Utilities.trimInternal(
+		doc.evaluate('//div[@class="description"]/h1', doc, ns, XPathResult.ANY_TYPE, null).iterateNext().textContent
+	);
+	
+	var author = doc.evaluate('//a[@class="author_link"]', doc, ns, XPathResult.ANY_TYPE, null).iterateNext().textContent;
+	// Authors here are Last Name, First initial(s) (ФИО)
+	var spaceIndex = author.lastIndexOf(" ");
+	var firstName = author.substring(spaceIndex+1);
+	var lastName = author.substring(0, spaceIndex);
+	item.creators.push({firstName:firstName, lastName:lastName, creatorType:"author"});
+	
+	var info = doc.evaluate('//p[@class="summary"]', doc, ns, XPathResult.ANY_TYPE, null).iterateNext().textContent;
+	var pub = info.match(/(Нәшрият|Издательство): (.+)/);
+	var publisher = pub[2];
+	yr = info.match(/(Нәшрият|Издательство): (.+),\s+(\d+)\s(ел|г)\./);
+	var year = yr[3];
+
+	var pagematch = info.match(/(\d+) (бит|страница|страниц|страницы)/);
+	var pages = pagematch[1];
+	item.publisher = Zotero.Utilities.trimInternal(publisher);
+	item.date = Zotero.Utilities.trimInternal(year);
+	item.numPages = pages;
+	
+	var description = doc.evaluate('//div[@class="description"]/p[2]', doc, ns, XPathResult.ANY_TYPE, null).iterateNext().textContent;
+	item.abstractNote = description;
+	
+	item.url = url;
+	
+	item.complete();
+}
+
 function detectWeb(doc, url) {
 	if (url.match("books/search?")) {
 		return "multiple";
@@ -73,8 +111,7 @@ function doWeb(doc, url) {
 	var ns = n ? function(prefix) {
 		if (prefix == 'x') return n; else return null;
 	} : null;
-	
-	var books = new Array();
+
 	if (detectWeb(doc, url) == "multiple") {
 		var tablerow = doc.evaluate('//table[@class="books_list"]/tbody/tr', doc, ns, XPathResult.ANY_TYPE, null);
 		var items = new Array();
@@ -85,48 +122,17 @@ function doWeb(doc, url) {
 			var url = link.href;
 			items[url] = title;
 		}
-		items = Zotero.selectItems(items);
-		if(!items) return true;
-		for (var i in items) {
-			books.push(i);
-		}
+		Zotero.selectItems(items, function(items) {
+			if(!items) return true;
+			var books = new Array();
+			for (var i in items) {
+				books.push(i);
+			}
+			ZU.processDocuments(books, function(doc){ scrape(doc, doc.location.href) });
+		});
 	} else {
-		books = [url];
+		scrape(doc, url);
 	}
-	
-	Zotero.Utilities.processDocuments(books, function(doc) {
-		item = new Zotero.Item("book");
-		item.title = Zotero.Utilities.trimInternal(
-			doc.evaluate('//div[@class="description"]/h1', doc, ns, XPathResult.ANY_TYPE, null).iterateNext().textContent
-		);
-		
-		var author = doc.evaluate('//a[@class="author_link"]', doc, ns, XPathResult.ANY_TYPE, null).iterateNext().textContent;
-		// Authors here are Last Name, First initial(s) (ФИО)
-		var spaceIndex = author.lastIndexOf(" ");
-		var firstName = author.substring(spaceIndex+1);
-		var lastName = author.substring(0, spaceIndex);
-		item.creators.push({firstName:firstName, lastName:lastName, creatorType:"author"});
-		
-		var info = doc.evaluate('//p[@class="summary"]', doc, ns, XPathResult.ANY_TYPE, null).iterateNext().textContent;
-		var pub = info.match(/(Нәшрият|Издательство): (.+)/);
-		var publisher = pub[2];
-		yr = info.match(/(Нәшрият|Издательство): (.+),\s+(\d+)\s(ел|г)\./);
-		var year = yr[3];
-	
-		var pagematch = info.match(/(\d+) (бит|страница|страниц|страницы)/);
-		var pages = pagematch[1];
-		item.publisher = Zotero.Utilities.trimInternal(publisher);
-		item.date = Zotero.Utilities.trimInternal(year);
-		item.numPages = pages;
-		
-		var description = doc.evaluate('//div[@class="description"]/p[2]', doc, ns, XPathResult.ANY_TYPE, null).iterateNext().textContent;
-		item.abstractNote = description;
-		
-		item.url = url;
-		
-		item.complete();
-	}, function() {Zotero.done();});
-	Zotero.wait();
 }
 /** BEGIN TEST CASES **/
 var testCases = [

The Atlantic.js

@@ -9,7 +9,7 @@
 	"inRepository": true,
 	"translatorType": 4,
 	"browserSupport": "gcs",
-	"lastUpdated": "2011-10-23 15:18:54"
+	"lastUpdated": "2012-03-05 03:55:36"
 }
 
 /*
@@ -245,7 +245,6 @@ var testCases = [
 				"seeAlso": [],
 				"attachments": [
 					{
-						"url": false,
 						"title": "Chronicle of Higher Education Snapshot",
 						"mimeType": "text/html"
 					}
@@ -255,8 +254,11 @@ var testCases = [
 				"ISSN": "0009-5982",
 				"date": "June 16, 2006",
 				"title": "Grinnell's Green Secrets",
-				"section": "News",
-				"libraryCatalog": "The Chronicle of Higher Education"
+				"section": "News : Short Subjects",
+				"pages": "A9",
+				"edition": "Volume 52, Issue 41",
+				"libraryCatalog": "The Chronicle of Higher Education",
+				"accessDate": "CURRENT_TIMESTAMP"
 			}
 		]
 	},

The Chronicle of Higher Education.js

@@ -2,14 +2,14 @@
 	"translatorID": "0c661209-5ec8-402b-8f18-7dec6ae37d95",
 	"label": "The Free Dictionary",
 	"creator": "Michael Berkowitz",
-	"target": "http://(.*\\.)?thefreedictionary.com/(\\w+)",
+	"target": "http://(.*\\.)?thefreedictionary.com/\\w+$",
 	"minVersion": "1.0.0b4.r5",
 	"maxVersion": "",
 	"priority": 100,
 	"inRepository": true,
 	"translatorType": 4,
 	"browserSupport": "gcs",
-	"lastUpdated": "2012-01-30 22:42:23"
+	"lastUpdated": "2012-03-05 03:44:25"
 }
 
 function detectWeb(doc, url) {

The Daily Beast.js

@@ -9,13 +9,13 @@
 	"inRepository": true,
 	"translatorType": 4,
 	"browserSupport": "gcs",
-	"lastUpdated": "2012-01-30 22:42:12"
+	"lastUpdated": "2012-03-05 03:14:39"
 }
 
 function detectWeb(doc, url) {
-	if (doc.location.href.match("SearchResults")) {
+	if (url.indexOf("SearchResults") != -1) {
 		return "multiple";
-	} else if (doc.location.href.match("article")) {
+	} else if (url.indexOf("article") != -1) {
 		return "newspaperArticle";
 	}
 }
@@ -70,7 +70,10 @@ function scrape(doc, url) {
 
 	var xPathTitle = '//h1';
 	newItem.title = doc.evaluate(xPathTitle, doc, nsResolver, XPathResult.ANY_TYPE, null).iterateNext().textContent;	
-	
+
+	newItem.abstractNote = ZU.xpathText(doc, '//meta[@name="Description"]/@content');
+	newItem.date = ZU.xpathText(doc, '//span[contains(@class,"ts-publishdate")]');
+
 	newItem.url = doc.location.href;
 	newItem.publicationTitle = "The Hamilton Spectator";
 
@@ -83,8 +86,6 @@ function doWeb(doc, url) {
 		if (prefix == 'x') return namespace; else return null;
 	} : null;
 
-	var articles = new Array();
-	
 	if (detectWeb(doc, url) == "multiple") {
 		var items = new Object();
 
@@ -94,15 +95,18 @@ function doWeb(doc, url) {
 		while (next_title = titles.iterateNext()) {
 				items[next_title.href] = next_title.textContent;
 		}
-		items = Zotero.selectItems(items);
-		for (var i in items) {
-			articles.push(i);
-		}
+		Zotero.selectItems(items, function(items) {
+			if(!items) return true;
+
+			var articles = new Array();
+			for (var i in items) {
+				articles.push(i);
+			}
+			ZU.processDocuments(articles, function(doc) { scrape(doc, doc.location.href) });
+		});
 	} else {
-		articles = [url];
+		scrape(doc, url);
 	}
-	Zotero.Utilities.processDocuments(articles, scrape, function() {Zotero.done();});
-	Zotero.wait();
 }/** BEGIN TEST CASES **/
 var testCases = [
 	{
@@ -123,6 +127,8 @@ var testCases = [
 				"seeAlso": [],
 				"attachments": [],
 				"title": "Expert calls Occupy demos most important in generations",
+				"abstractNote": "The Occupy protest is the most important democratic social movement of the last two generations and demonstrators who have taken over parks and other",
+				"date": "Wed Nov 16 2011",
 				"url": "http://www.thespec.com/news/ontario/article/626278--expert-calls-occupy-demos-most-important-in-generations",
 				"publicationTitle": "The Hamilton Spectator",
 				"libraryCatalog": "The Hamilton Spectator",