Skip to content

Commit

Permalink
删除冗余代码；修复Labels不返回Element的潜在bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@jiaojiaodubai
jiaojiaodubai committed Dec 25, 2023
1 parent 4930917 commit 910f702
Show file tree
Hide file tree
Showing 6 changed files with 1,313 additions and 1,288 deletions.
14 changes: 9 additions & 5 deletions Baidu Scholar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,15 @@ class Labels {
getWith(label, element = false) {
if (Array.isArray(label)) {
let result = label
.map(element => this.getWith(element))
.filter(element => element);
return result.length
? result.find(element => element)
: '';
.map(aLabel => this.getWith(aLabel, element));
result = element
? result.find(element => element.childNodes.length)
: result.find(element => element);
return result
? result
: element
? document.createElement('div')
: '';
}
let pattern = new RegExp(label);
let keyValPair = this.innerData.find(element => pattern.test(element[0]));
Expand Down
338 changes: 170 additions & 168 deletions CCPINFO.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ async function scrape(doc, url = doc.location.href) {
var newItem = new Zotero.Item('book');
newItem.extra = '';
let labels = new Labels(doc, '.book_intro .fl.clearfix, .book_intro .fr.clearfix');
Z.debug(labels.stringfy());
Z.debug(labels.innerData.map(arr => [arr[0], ZU.trimInternal(arr[1].innerText)]));
newItem.title = text(doc, '.book_intro > h2 > span');
newItem.abstractNote = text(doc, 'div.field_1 > p');
newItem.publisher = labels.getWith('出版社');
Expand Down Expand Up @@ -131,21 +131,27 @@ async function scrape(doc, url = doc.location.href) {
class Labels {
constructor(doc, selector) {
this.innerData = [];
Array.from(doc.querySelectorAll(selector)).forEach((element) => {
let elementCopy = element.cloneNode(true);
let key = elementCopy.removeChild(elementCopy.firstElementChild).innerText.replace(/\s/g, '');
this.innerData.push([key, elementCopy]);
});
Array.from(doc.querySelectorAll(selector))
.filter(element => element.firstElementChild)
.forEach((element) => {
let elementCopy = element.cloneNode(true);
let key = elementCopy.removeChild(elementCopy.firstElementChild).innerText.replace(/\s/g, '');
this.innerData.push([key, elementCopy]);
});
}

getWith(label, element = false) {
if (Array.isArray(label)) {
let result = label
.map(element => this.getWith(element))
.filter(element => element);
return result.length
? result.find(element => element)
: '';
.map(aLabel => this.getWith(aLabel, element));
result = element
? result.find(element => element.childNodes.length)
: result.find(element => element);
return result
? result
: element
? document.createElement('div')
: '';
}
let pattern = new RegExp(label);
let keyValPair = this.innerData.find(element => pattern.test(element[0]));
Expand All @@ -154,10 +160,6 @@ class Labels {
? ZU.trimInternal(keyValPair[1].innerText)
: '';
}

stringfy() {
return this.innerData.map(element => [element[0], element[1].innerText]);
}
}

function addExtra(key, value) {
Expand All @@ -167,158 +169,158 @@ function addExtra(key, value) {
}

/** BEGIN TEST CASES **/
var testCases = [
{
"type": "web",
"url": "https://book.cppinfo.cn/Encyclopedias/home/index?id=4417147",
"items": [
{
"itemType": "book",
"title": "朗文新编英语语法",
"creators": [
{
"firstName": "",
"lastName": "(英)马克·福利",
"creatorType": "author",
"fieldMode": 1
}
],
"date": "2022-07",
"ISBN": "9787562866350",
"abstractNote": "《朗文新编英语语法》由我社从培生教育出版公司引进，可供中学生、大学生以及英语学习者自学使用。本书由诊断测试、语法讲解和练习答案三部分组成。学习者可利用图书前面的诊断测试，在单元学习前，了解自己的薄弱项，从而进行有针对性的学习。语法知识点讲解部分共分为36个单元，包含一般语法书中的所有内容，语法解释详细，内容条理清晰。每个单元还配套丰富的练习题，学习者可通过练习巩固所学的语法点。本书所有例句均选自语料库，表达地道，是中高水平学习者巩固语法的不二之选。",
"extra": "中图分类: H314",
"language": "zh-CN",
"libraryCatalog": "CCPINFO",
"publisher": "郑州大学出版社有限公司",
"url": "https://book.cppinfo.cn/Encyclopedias/home/index?id=4417147",
"attachments": [],
"tags": [
{
"tag": "单元"
},
{
"tag": "学习者"
},
{
"tag": "本书"
},
{
"tag": "测试"
},
{
"tag": "练习"
},
{
"tag": "讲解"
},
{
"tag": "语料库"
},
{
"tag": "语法"
}
],
"notes": [],
"seeAlso": []
}
]
},
{
"type": "web",
"url": "https://book.cppinfo.cn/Encyclopedias/home/index?id=4567148",
"items": [
{
"itemType": "book",
"title": "拜占庭帝国大通史（330—610）",
"creators": [
{
"firstName": "",
"lastName": "徐家玲",
"creatorType": "author",
"fieldMode": 1
},
{
"firstName": "",
"lastName": "林英",
"creatorType": "author",
"fieldMode": 1
}
],
"date": "2023-10",
"ISBN": "9787214275707",
"abstractNote": "本书全面、系统地梳理了330-610年拜占庭王朝历史以及帝国的崛起。上编为皇帝列传，介绍了君士坦丁王朝、瓦伦提尼安诸帝、塞奥多西王朝、利奥王朝、查士丁尼王朝历史。下编为拜占庭帝国的崛起，从世界地理观、宗教、种族与身份认同、自然灾害等方面加以论述，聚焦拜占庭帝国历史的第一黄金时代，对查士丁尼时代的司法改革、宗教思想和政策、制度、经济生活等方面进行系统论述，展现拜占庭帝国的崛起图景。本书是具有唯物史观特色的、有可靠依据的独立意见和系列研究成果，形成了我国学者对拜占庭历史发展和文化演化的话语体系。",
"extra": "中图分类: K134",
"language": "zh-CN",
"libraryCatalog": "CCPINFO",
"publisher": "江苏人民出版社",
"url": "https://book.cppinfo.cn/Encyclopedias/home/index?id=4567148",
"attachments": [],
"tags": [
{
"tag": "历史"
},
{
"tag": "宗教"
},
{
"tag": "崛起"
},
{
"tag": "帝国"
},
{
"tag": "本书"
},
{
"tag": "王朝"
},
{
"tag": "论述"
}
],
"notes": [],
"seeAlso": []
}
]
},
{
"type": "web",
"url": "https://book.cppinfo.cn/Encyclopedias/home/index?id=4479822",
"items": [
{
"itemType": "book",
"title": "新时代中国之治 如何跳出治乱兴衰的历史周期率(英文)",
"creators": [
{
"firstName": "",
"lastName": "李君如",
"creatorType": "author",
"fieldMode": 1
}
],
"date": "2022-11",
"ISBN": "9787119132037",
"abstractNote": "Since the 18th National Congress of the Communist Party of China in 2012， the drive to develop socialism with Chinese characteristics has entered a new era. The past decade has seen the country forging ahead and embracing historic changes， with remarkable achievements made by the Party and the state.\n So how did China make these achievements? What are the secrets to the CPC's governance of China? What is the key to the success of China's governance in the new era?\n This book covers such important topics as \"how to break the cycle of rise and fall\"， \"whole-process people's democracy\"， \"self-reform and social revolution\"， \"cyber governance\"， and \"Chinese-style modernization\"， reveals the secrets to the success of China's governance in the new era， and shares China's wisdom and solutions with the world.",
"extra": "中图分类: D616",
"language": "en-US",
"libraryCatalog": "CCPINFO",
"publisher": "外文出版社",
"url": "https://book.cppinfo.cn/Encyclopedias/home/index?id=4479822",
"attachments": [],
"tags": [
{
"tag": "Chinese"
}
],
"notes": [],
"seeAlso": []
}
]
},
{
"type": "web",
"url": "https://book.cppinfo.cn/so/home/qhsearch?q=%E4%B8%89%E4%BD%93",
"items": "multiple"
}
var testCases = [
{
"type": "web",
"url": "https://book.cppinfo.cn/Encyclopedias/home/index?id=4417147",
"items": [
{
"itemType": "book",
"title": "朗文新编英语语法",
"creators": [
{
"firstName": "",
"lastName": "(英)马克·福利",
"creatorType": "author",
"fieldMode": 1
}
],
"date": "2022-07",
"ISBN": "9787562866350",
"abstractNote": "《朗文新编英语语法》由我社从培生教育出版公司引进，可供中学生、大学生以及英语学习者自学使用。本书由诊断测试、语法讲解和练习答案三部分组成。学习者可利用图书前面的诊断测试，在单元学习前，了解自己的薄弱项，从而进行有针对性的学习。语法知识点讲解部分共分为36个单元，包含一般语法书中的所有内容，语法解释详细，内容条理清晰。每个单元还配套丰富的练习题，学习者可通过练习巩固所学的语法点。本书所有例句均选自语料库，表达地道，是中高水平学习者巩固语法的不二之选。",
"extra": "中图分类: H314",
"language": "zh-CN",
"libraryCatalog": "CCPINFO",
"publisher": "郑州大学出版社有限公司",
"url": "https://book.cppinfo.cn/Encyclopedias/home/index?id=4417147",
"attachments": [],
"tags": [
{
"tag": "单元"
},
{
"tag": "学习者"
},
{
"tag": "本书"
},
{
"tag": "测试"
},
{
"tag": "练习"
},
{
"tag": "讲解"
},
{
"tag": "语料库"
},
{
"tag": "语法"
}
],
"notes": [],
"seeAlso": []
}
]
},
{
"type": "web",
"url": "https://book.cppinfo.cn/Encyclopedias/home/index?id=4567148",
"items": [
{
"itemType": "book",
"title": "拜占庭帝国大通史（330—610）",
"creators": [
{
"firstName": "",
"lastName": "徐家玲",
"creatorType": "author",
"fieldMode": 1
},
{
"firstName": "",
"lastName": "林英",
"creatorType": "author",
"fieldMode": 1
}
],
"date": "2023-10",
"ISBN": "9787214275707",
"abstractNote": "本书全面、系统地梳理了330-610年拜占庭王朝历史以及帝国的崛起。上编为皇帝列传，介绍了君士坦丁王朝、瓦伦提尼安诸帝、塞奥多西王朝、利奥王朝、查士丁尼王朝历史。下编为拜占庭帝国的崛起，从世界地理观、宗教、种族与身份认同、自然灾害等方面加以论述，聚焦拜占庭帝国历史的第一黄金时代，对查士丁尼时代的司法改革、宗教思想和政策、制度、经济生活等方面进行系统论述，展现拜占庭帝国的崛起图景。本书是具有唯物史观特色的、有可靠依据的独立意见和系列研究成果，形成了我国学者对拜占庭历史发展和文化演化的话语体系。",
"extra": "中图分类: K134",
"language": "zh-CN",
"libraryCatalog": "CCPINFO",
"publisher": "江苏人民出版社",
"url": "https://book.cppinfo.cn/Encyclopedias/home/index?id=4567148",
"attachments": [],
"tags": [
{
"tag": "历史"
},
{
"tag": "宗教"
},
{
"tag": "崛起"
},
{
"tag": "帝国"
},
{
"tag": "本书"
},
{
"tag": "王朝"
},
{
"tag": "论述"
}
],
"notes": [],
"seeAlso": []
}
]
},
{
"type": "web",
"url": "https://book.cppinfo.cn/Encyclopedias/home/index?id=4479822",
"items": [
{
"itemType": "book",
"title": "新时代中国之治 如何跳出治乱兴衰的历史周期率(英文)",
"creators": [
{
"firstName": "",
"lastName": "李君如",
"creatorType": "author",
"fieldMode": 1
}
],
"date": "2022-11",
"ISBN": "9787119132037",
"abstractNote": "Since the 18th National Congress of the Communist Party of China in 2012， the drive to develop socialism with Chinese characteristics has entered a new era. The past decade has seen the country forging ahead and embracing historic changes， with remarkable achievements made by the Party and the state.\n So how did China make these achievements? What are the secrets to the CPC's governance of China? What is the key to the success of China's governance in the new era?\n This book covers such important topics as \"how to break the cycle of rise and fall\"， \"whole-process people's democracy\"， \"self-reform and social revolution\"， \"cyber governance\"， and \"Chinese-style modernization\"， reveals the secrets to the success of China's governance in the new era， and shares China's wisdom and solutions with the world.",
"extra": "中图分类: D616",
"language": "en-US",
"libraryCatalog": "CCPINFO",
"publisher": "外文出版社",
"url": "https://book.cppinfo.cn/Encyclopedias/home/index?id=4479822",
"attachments": [],
"tags": [
{
"tag": "Chinese"
}
],
"notes": [],
"seeAlso": []
}
]
},
{
"type": "web",
"url": "https://book.cppinfo.cn/so/home/qhsearch?q=%E4%B8%89%E4%BD%93",
"items": "multiple"
}
]
/** END TEST CASES **/
Loading

1 comment on commit 910f702

@jiaojiaodubai
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

因为是内部代码接口的更新，对用户没有影响，所以没有更新“lastupdate”。这个diff有点虚高了，我不知道为啥。

Please sign in to comment.