Skip to content

Commit caa48cc

Browse files
committed
basic fix for Kommersant; this is all I'll do - if @AJLyon wants to do more on that, that'd be great, of course
1 parent a23b4fb commit caa48cc

File tree

1 file changed

+32
-64
lines changed

1 file changed

+32
-64
lines changed

Kommersant.js

+32-64
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"inRepository": true,
1010
"translatorType": 4,
1111
"browserSupport": "gcsibv",
12-
"lastUpdated": "2013-03-13 20:49:52"
12+
"lastUpdated": "2014-01-05 17:14:25"
1313
}
1414

1515
/* FW LINE 57:6869c32952b1 */ function flatten(c){var b=new Array();for(var d in c){var e=c[d];if(e instanceof Array){b=b.concat(flatten(e))}else{b.push(e)}}return b}var FW={_scrapers:new Array()};FW._Base=function(){this.callHook=function(b,c,e,a){if(typeof this["hooks"]==="object"){var d=this["hooks"][b];if(typeof d==="function"){d(c,e,a)}}};this.evaluateThing=function(f,e,c){var b=typeof f;if(b==="object"){if(f instanceof Array){var d=this.evaluateThing;var a=f.map(function(g){return d(g,e,c)});return flatten(a)}else{return f.evaluate(e,c)}}else{if(b==="function"){return f(e,c)}else{return f}}}};FW.Scraper=function(a){FW._scrapers.push(new FW._Scraper(a))};FW._Scraper=function(a){for(x in a){this[x]=a[x]}this._singleFieldNames=["abstractNote","applicationNumber","archive","archiveLocation","artworkMedium","artworkSize","assignee","audioFileType","audioRecordingType","billNumber","blogTitle","bookTitle","callNumber","caseName","code","codeNumber","codePages","codeVolume","committee","company","conferenceName","country","court","date","dateDecided","dateEnacted","dictionaryTitle","distributor","docketNumber","documentNumber","DOI","edition","encyclopediaTitle","episodeNumber","extra","filingDate","firstPage","forumTitle","genre","history","institution","interviewMedium","ISBN","ISSN","issue","issueDate","issuingAuthority","journalAbbreviation","label","language","legalStatus","legislativeBody","letterType","libraryCatalog","manuscriptType","mapType","medium","meetingName","nameOfAct","network","number","numberOfVolumes","numPages","pages","patentNumber","place","postType","presentationType","priorityNumbers","proceedingsTitle","programTitle","programmingLanguage","publicLawNumber","publicationTitle","publisher","references","reportNumber","reportType","reporter","reporterVolume","rights","runningTime","scale","section","series","seriesNumber","seriesText","seriesTitle","session","shortTitle","studio","subject","system","thesisType","title","type","university","url","version","videoRecordingType","volume","websiteTitle","websiteType"];this._makeAttachments=function(p,b,g,t){if(g instanceof Array){g.forEach(function(k){this._makeAttachments(p,b,k,t)},this)}else{if(typeof g==="object"){var o=g.urls||g.url;var m=g.types||g.type;var f=g.titles||g.title;var q=g.snapshots||g.snapshot;var j=this.evaluateThing(o,p,b);var n=this.evaluateThing(f,p,b);var s=this.evaluateThing(m,p,b);var d=this.evaluateThing(q,p,b);if(!(j instanceof Array)){j=[j]}for(var l in j){var c=j[l];var h;var e;var r;if(s instanceof Array){h=s[l]}else{h=s}if(n instanceof Array){e=n[l]}else{e=n}if(d instanceof Array){r=d[l]}else{r=d}t.attachments.push({url:c,title:e,type:h,snapshot:r})}}}};if(this.itemTrans!==undefined){this.makeItems=this.itemTrans.makeItems}else{this.makeItems=function(o,b,m,c,l){var q=new Zotero.Item(this.itemType);q.url=b;for(var h in this._singleFieldNames){var n=this._singleFieldNames[h];if(this[n]){var g=this.evaluateThing(this[n],o,b);if(g instanceof Array){q[n]=g[0]}else{q[n]=g}}}var r=["creators","tags"];for(var f in r){var p=r[f];var d=this.evaluateThing(this[p],o,b);if(d){for(var e in d){q[p].push(d[e])}}}this._makeAttachments(o,b,this["attachments"],q);c(q,this,o,b);l([q])}}};FW._Scraper.prototype=new FW._Base;FW.MultiScraper=function(a){FW._scrapers.push(new FW._MultiScraper(a))};FW._MultiScraper=function(a){for(x in a){this[x]=a[x]}this._mkSelectItems=function(e,d){var b=new Object;for(var c in e){b[d[c]]=e[c]}return b};this._selectItems=function(d,c,e){var b=new Array();Zotero.selectItems(this._mkSelectItems(d,c),function(f){for(var g in f){b.push(g)}e(b)})};this._mkAttachments=function(g,d,f){var b=this.evaluateThing(this["attachments"],g,d);var c=new Object();if(b){for(var e in f){c[f[e]]=b[e]}}return c};this._makeChoices=function(f,p,c,d,h){if(f instanceof Array){f.forEach(function(k){this._makeTitlesUrls(k,p,c,d,h)},this)}else{if(typeof f==="object"){var m=f.urls||f.url;var e=f.titles||f.title;var n=this.evaluateThing(m,p,c);var j=this.evaluateThing(e,p,c);var l=(j instanceof Array);if(!(n instanceof Array)){n=[n]}for(var g in n){var b=n[g];var o;if(l){o=j[g]}else{o=j}h.push(b);d.push(o)}}}};this.makeItems=function(j,b,g,c,f){if(this.beforeFilter){var k=this.beforeFilter(j,b);if(k!=b){this.makeItems(j,k,g,c,f);return}}var e=[];var h=[];this._makeChoices(this["choices"],j,b,e,h);var d=this._mkAttachments(j,b,h);this._selectItems(e,h,function(m){if(!m){f([])}else{var l=[];var n=this.itemTrans;Zotero.Utilities.processDocuments(m,function(q){var p=q.documentURI;var o=n;if(o===undefined){o=FW.getScraper(q,p)}if(o===undefined){}else{o.makeItems(q,p,d[p],function(r){l.push(r);c(r,o,q,p)},function(){})}},function(){f(l)})}})}};FW._MultiScraper.prototype=new FW._Base;FW.DelegateTranslator=function(a){return new FW._DelegateTranslator(a)};FW._DelegateTranslator=function(a){for(x in a){this[x]=a[x]}this._translator=Zotero.loadTranslator(this.translatorType);this._translator.setTranslator(this.translatorId);this.makeItems=function(g,d,b,f,c){var e;Zotero.Utilities.HTTP.doGet(d,function(h){this._translator.setHandler("itemDone",function(k,j){e=j;if(b){j.attachments=b}});if(this.preProcess){h=this.preProcess(h)}this._translator.setString(h);this._translator.translate();f(e)},function(){c([e])})}};FW.DelegateTranslator.prototype=new FW._Scraper;FW._StringMagic=function(){this._filters=new Array();this.addFilter=function(a){this._filters.push(a);return this};this.split=function(a){return this.addFilter(function(b){return b.split(a).filter(function(c){return(c!="")})})};this.replace=function(c,b,a){return this.addFilter(function(d){if(d.match(c)){return d.replace(c,b,a)}else{return d}})};this.prepend=function(a){return this.replace(/^/,a)};this.append=function(a){return this.replace(/$/,a)};this.remove=function(b,a){return this.replace(b,"",a)};this.trim=function(){return this.addFilter(function(a){return Zotero.Utilities.trim(a)})};this.trimInternal=function(){return this.addFilter(function(a){return Zotero.Utilities.trimInternal(a)})};this.match=function(a,b){if(!b){b=0}return this.addFilter(function(d){var c=d.match(a);if(c===undefined||c===null){return undefined}else{return c[b]}})};this.cleanAuthor=function(b,a){return this.addFilter(function(c){return Zotero.Utilities.cleanAuthor(c,b,a)})};this.key=function(a){return this.addFilter(function(b){return b[a]})};this.capitalizeTitle=function(){if(arguments.length>0&&arguments[0]==true){return this.addFilter(function(a){return Zotero.Utilities.capitalizeTitle(a,true)})}else{return this.addFilter(function(a){return Zotero.Utilities.capitalizeTitle(a)})}};this.unescapeHTML=function(){return this.addFilter(function(a){return Zotero.Utilities.unescapeHTML(a)})};this.unescape=function(){return this.addFilter(function(a){return unescape(a)})};this._applyFilters=function(c,e){for(i in this._filters){c=flatten(c);c=c.filter(function(a){return((a!==undefined)&&(a!==null))});for(var d=0;d<c.length;d++){try{if((c[d]===undefined)||(c[d]===null)){continue}else{c[d]=this._filters[i](c[d],e)}}catch(b){c[d]=undefined;Zotero.debug("Caught exception "+b+"on filter: "+this._filters[i])}}c=c.filter(function(a){return((a!==undefined)&&(a!==null))})}return flatten(c)}};FW.PageText=function(){return new FW._PageText()};FW._PageText=function(){this._filters=new Array();this.evaluate=function(c){var b=[c.documentElement.innerHTML];b=this._applyFilters(b,c);if(b.length==0){return false}else{return b}}};FW._PageText.prototype=new FW._StringMagic();FW.Url=function(){return new FW._Url()};FW._Url=function(){this._filters=new Array();this.evaluate=function(d,c){var b=[c];b=this._applyFilters(b,d);if(b.length==0){return false}else{return b}}};FW._Url.prototype=new FW._StringMagic();FW.Xpath=function(a){return new FW._Xpath(a)};FW._Xpath=function(a){this._xpath=a;this._filters=new Array();this.text=function(){var b=function(c){if(typeof c==="object"&&c.textContent){return c.textContent}else{return c}};this.addFilter(b);return this};this.sub=function(b){var c=function(f,e){var d=e.evaluate(b,f,null,XPathResult.ANY_TYPE,null);if(d){return d.iterateNext()}else{return undefined}};this.addFilter(c);return this};this.evaluate=function(f){var e=f.evaluate(this._xpath,f,null,XPathResult.ANY_TYPE,null);var d=e.resultType;var c=new Array();if(d==XPathResult.STRING_TYPE){c.push(e.stringValue)}else{if(d==XPathResult.ORDERED_NODE_ITERATOR_TYPE||d==XPathResult.UNORDERED_NODE_ITERATOR_TYPE){var b;while((b=e.iterateNext())){c.push(b)}}}c=this._applyFilters(c,f);if(c.length==0){return false}else{return c}}};FW._Xpath.prototype=new FW._StringMagic();FW.detectWeb=function(e,b){for(var c in FW._scrapers){var d=FW._scrapers[c];var f=d.evaluateThing(d.itemType,e,b);var a=d.evaluateThing(d.detect,e,b);if(a.length>0&&a[0]){return f}}return undefined};FW.getScraper=function(b,a){var c=FW.detectWeb(b,a);return FW._scrapers.filter(function(d){return(d.evaluateThing(d.itemType,b,a)==c)&&(d.evaluateThing(d.detect,b,a))})[0]};FW.doWeb=function(c,a){var b=FW.getScraper(c,a);b.makeItems(c,a,[],function(f,e,g,d){e.callHook("scraperDone",f,g,d);if(!f.title){f.title=""}f.complete()},function(){Zotero.done()});Zotero.wait()};
@@ -40,69 +40,35 @@ function detectWeb(doc, url) {
4040
}
4141
function doWeb(doc, url) { return FW.doWeb(doc, url); }
4242

43-
43+
//technically these should be (and used to be) different item types and we should account for them, but this at least makes this work again in a basic fashion
4444
/** Articles */
4545
FW.Scraper({ itemType : 'magazineArticle',
46-
detect : FW.Xpath('//div[@class="issue"]/a[contains(text(),"Журнал")]|//div[@class="issue"]/a[contains(text(),"Еженедельник")]'),
47-
title : FW.Xpath('//div[@class="document"]/div[@class="title"]').text().trim(),
46+
detect : FW.Xpath('//h2[@class="article_name"]'),
47+
title : FW.Xpath('//h2[@class="article_name"]').text().trim(),
4848
attachments : [
4949
{
5050
url : FW.Url(),
5151
type : "text/html",
5252
title : "Kommersant Snapshot"
5353
} ],
54-
creators : FW.Xpath('//div[contains(@class, "document_authors")][preceding-sibling::div[@class="document_vvodka"]]').text().split(",").cleanAuthor("author"),
55-
date : FW.Xpath('//div[@class="issue"]/a').text().replace(/\n/g," ").replace(/^.*(\d{2})\.(\d{2})\.(\d{4})\s*$/,"$3-$2-$1"),
56-
issue : FW.Xpath('//div[@class="issue"]/a').text().match(/\s*(\d+(?: \(\d+\))?)/,1),
57-
abstractNote : FW.Xpath('//div[@class="document_vvodka"]').text().trimInternal(),
54+
creators : FW.Xpath('//li[@rel="author"]/a').text().split(",").cleanAuthor("author"),
55+
date : FW.Xpath('//div[contains(@class, "b-article_issue_number")]').text().match(/\d{2}\.\d{2}\.\d{4}/),
56+
issue : FW.Xpath('//div[contains(@class, "b-article_issue_number")]/a').text().match(/\d+/),
57+
abstractNote : FW.Xpath('//span[@class="b-article__intro"]').text().trimInternal(),
5858
url : FW.Url().replace(/(\?|&)stamp.+/, ""),
59-
publicationTitle : FW.Xpath('//div[@class="issue"]/a').text().match(/^\s*(Журнал|Еженедельник)\s+"([^"]+)"/,2)
59+
pages : FW.Xpath('//div[contains(@class, "b-article_issue_number")]').text().match(/стр.\s*\d+/).remove(/стр.\s*/),
60+
publicationTitle : FW.Xpath('//div[contains(@class, "b-article_issue_number")]').text().match(/.+/).remove(//).remove(/\. Приложение/),
61+
hooks : { "scraperDone": function (item,doc, url) {
62+
if (!item.publicationTitle) item.publicationTitle = "Коммерсантъ";
63+
}}
6064
});
6165

62-
/** News Articles */
63-
FW.Scraper({ itemType : 'newspaperArticle',
64-
detect : FW.Xpath('//div[@class="issue"]/a[contains(text(),"Газета") or contains(text(),"Online") or contains(text(),"FM") or contains(text(),"Уфа")]'),
65-
title : FW.Xpath('//div[@class="document"]/div[@class="title"]').text().trim(),
66-
attachments : [
67-
{
68-
url : FW.Url(),
69-
type : "text/html",
70-
title : "Kommersant Snapshot"
71-
} ],
72-
creators : FW.Xpath('//div[contains(@class, "document_authors")][preceding-sibling::div[@class="document_vvodka"]]')
73-
.text().replace(/\s?отдел\s[^,]*,?/gi,"")
74-
.split(",").trim().cleanAuthor("author"),
75-
date : FW.Xpath('//div[@class="issue"]/a').text().replace(/\n/g," ").replace(/^.*(\d{2})\.(\d{2})\.(\d{4})\s*(?:\/\/\s*\d+:\d+)?$/,"$3-$2-$1"),
76-
issue : FW.Xpath('//div[@class="issue"]/a').text().match(/\s*(\d+(?: \(\d+\))?)/,1),
77-
abstractNote : FW.Xpath('//div[@class="document_vvodka"]').text().trimInternal(),
78-
url : FW.Url().replace(/(\?|&)stamp.+/, ""),
79-
publicationTitle : FW.Xpath('//div[@class="issue"]/a').text().match(/^[^"]*"([^"]+)"/,1)
80-
});
81-
82-
/** News Articles - second format */
83-
FW.Scraper({ itemType : 'newspaperArticle',
84-
detect : FW.Url().match(/\/News\//i),
85-
creators : FW.Xpath('//div[contains(@class, "document_authors")][preceding-sibling::div[@class="title"]]')
86-
.text().replace(/\s?отдел\s[^,]*,?/gi,"")
87-
.split(",").trim().cleanAuthor("author"),
88-
publicationTitle : "Коммерсантъ",
89-
title : FW.Xpath('//table[contains(@class,"news_block")]//div[@class="title"]|//div[contains(@class,"news_block")]//div[@class="title"]').text().trim(),
90-
attachments : [
91-
{
92-
url : FW.Url(),
93-
type : "text/html",
94-
title : "Kommersant Snapshot"
95-
} ],
96-
url : FW.Url().replace(/(\?|&)stamp.+/, ""),
97-
date : FW.Xpath('//div[contains(@class,"other_blockname")]/div[@class="f-h"]').text().replace(/^.*(\d{2})\.(\d{2})\.(\d{4}).*$/,"$3-$2-$1")
98-
});
99-
10066
/** Search results */
10167
FW.MultiScraper({ itemType : "multiple",
102-
detect : FW.Xpath('//table[contains(@class,"searchresults")]'),
68+
detect : FW.Xpath('//div[contains(@class,"search-results_list")]'),
10369
choices : {
104-
titles : FW.Xpath('//table[contains(@class,"searchresults")]//a[@class="f-z"]').text(),
105-
urls : FW.Xpath('//table[contains(@class,"searchresults")]//a[@class="f-z"]').key('href').text()
70+
titles : FW.Xpath('//h4[@class="article_name"]/a').text(),
71+
urls : FW.Xpath('//h4[@class="article_name"]/a').key('href').text()
10672
}
10773
});
10874

@@ -113,7 +79,7 @@ var testCases = [
11379
"url": "http://kommersant.ru/doc/1811182",
11480
"items": [
11581
{
116-
"itemType": "newspaperArticle",
82+
"itemType": "magazineArticle",
11783
"creators": [
11884
{
11985
"firstName": "Дмитрий",
@@ -126,18 +92,19 @@ var testCases = [
12692
"seeAlso": [],
12793
"attachments": [
12894
{
129-
"url": false,
13095
"title": "Kommersant Snapshot",
13196
"type": "text/html"
13297
}
13398
],
13499
"url": "http://kommersant.ru/doc/1811182",
135100
"abstractNote": "Как стало известно \"Ъ\", глава секретариата комиссии Таможенного союза (КТС) Сергей Глазьев с июля 2012 года может сменить работу: он не получил предложения войти в Евразийскую экономическую комиссию (ЕЭК) со стороны РФ. Действующие сотрудники КТС будут проходить аттестационную комиссию, чтобы попасть в управляющую структуру нового союза. Главная претензия к главе секретариата КТС — \"дефицит идеологии и проблемы с администрированием\": их с российской стороны будут восполнять переводом в ЕЭК сотрудников российских министерств.",
136-
"date": "2011-11-08",
137-
"issue": "208 (4749)",
138-
"publicationTitle": "Коммерсантъ",
101+
"date": "08.11.2011",
102+
"issue": "208",
103+
"pages": "1",
104+
"publicationTitle": "Газета \"Коммерсантъ\"",
139105
"title": "В Сергее Глазьеве не хватило евразийского",
140-
"libraryCatalog": "Kommersant"
106+
"libraryCatalog": "Kommersant",
107+
"accessDate": "CURRENT_TIMESTAMP"
141108
}
142109
]
143110
},
@@ -159,9 +126,10 @@ var testCases = [
159126
],
160127
"url": "http://www.kommersant.ru/doc/1832739",
161128
"abstractNote": "За тем, как проходят российские выборы в месте, где административный ресурс по географическим причинам ослаблен, наблюдал корреспондент \"Власти\" Артем Платов.",
162-
"date": "2011-12-12",
163-
"issue": "49 (953)",
164-
"publicationTitle": "Коммерсантъ Власть",
129+
"date": "12.12.2011",
130+
"issue": "49",
131+
"pages": "28",
132+
"publicationTitle": "Журнал \"Коммерсантъ Власть\"",
165133
"title": "Яблочный пуй",
166134
"libraryCatalog": "Kommersant",
167135
"accessDate": "CURRENT_TIMESTAMP"
@@ -173,23 +141,23 @@ var testCases = [
173141
"url": "http://www.kommersant.ru/doc/1836636?themeid=589",
174142
"items": [
175143
{
176-
"itemType": "newspaperArticle",
144+
"itemType": "magazineArticle",
177145
"creators": [],
178146
"notes": [],
179147
"tags": [],
180148
"seeAlso": [],
181149
"attachments": [
182150
{
183-
"url": false,
184151
"title": "Kommersant Snapshot",
185152
"type": "text/html"
186153
}
187154
],
188155
"url": "http://www.kommersant.ru/doc/1836636?themeid=589",
189-
"date": "2011-12-12",
190-
"publicationTitle": "Коммерсантъ FM",
156+
"date": "12.12.2011",
157+
"publicationTitle": "Коммерсантъ",
191158
"title": "\"Это не добровольное мероприятие, не по зову сердца, а по указке, по разнарядке\"",
192-
"libraryCatalog": "Kommersant"
159+
"libraryCatalog": "Kommersant",
160+
"accessDate": "CURRENT_TIMESTAMP"
193161
}
194162
]
195163
},

0 commit comments

Comments
 (0)