From e820662b286fc6b9cfa9c7aa25812c14b186a2f7 Mon Sep 17 00:00:00 2001
From: Linxzh <linxzh1989@gmail.com>
Date: Thu, 23 Nov 2023 10:14:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(CNKI.js):=20=E5=A2=9E=E5=8A=A0=E5=AF=B9?=
 =?UTF-8?q?=E6=96=B0=E6=90=9C=E7=B4=A2=E7=BD=91=E5=9D=80=E7=9A=84=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CNKI.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/CNKI.js b/CNKI.js
index f5b93b52..d4519c0d 100644
--- a/CNKI.js
+++ b/CNKI.js
@@ -2,14 +2,14 @@
 	"translatorID": "5c95b67b-41c5-4f55-b71a-48d5d7183063",
 	"label": "CNKI",
 	"creator": "Aurimas Vinckevicius, Xingzhong Lin",
-	"target": "https?://.*?/(kns8?s?/defaultresult/index|kns8?s?/AdvSearch|kcms/detail|KXReader/Detail\\?|KNavi/|Kreader/CatalogViewPage\\.aspx\\?|kcms2?/article/abstract\\?v=|kcms/doi/)",
+	"target": "https?://.*?/(kns8?s?/search\\?|kns8?s?/defaultresult/index|kns8?s?/AdvSearch|kcms/detail|KXReader/Detail\\?|KNavi/|Kreader/CatalogViewPage\\.aspx\\?|kcms2?/article/abstract\\?v=|kcms/doi/)",
 	"minVersion": "3.0",
 	"maxVersion": "",
 	"priority": 100,
 	"inRepository": true,
 	"translatorType": 4,
 	"browserSupport": "gcsibv",
-	"lastUpdated": "2023-11-21 14:49:24"
+	"lastUpdated": "2023-11-23 02:13:41"
 }
 
 /*
@@ -43,7 +43,6 @@ async function getRefWorksByID(id) {
 		{
 			method: "POST",
 			body: postData,
-			responseType: "application/x-www-form-urlencoded",
 			headers: {
 				Referer: refer
 			}
@@ -167,7 +166,7 @@ function getItemsFromSearchResults(doc, url, itemInfo) {
 		var title = a.innerText;
 		if (title) title = ZU.trimInternal(title);
 		var id = getIDFromURL(a.href) || getIDFromSearchRow(links[i]);
-		var itemUrl = "";
+		var itemUrl = a.href;
 		// Now can get db data from url in new version
 		// English articles
 		if (!id) {
@@ -180,8 +179,7 @@ function getItemsFromSearchResults(doc, url, itemInfo) {
 				url: itemUrl
 			};
 		} else {
-			itemUrl = `https://kns.cnki.net/KCMS/detail/detail.aspx?dbcode=${id.dbcode}&dbname=${id.dbname}&filename=${id.filename}&v=`;
-			id.url = itemUrl;
+			id.url = a.href;
 		}
 		// TODO: CAJ link has redirection
 		// var filelink = ZU.xpath(links[i], fileXpath);
@@ -202,6 +200,7 @@ function getItemsFromSearchResults(doc, url, itemInfo) {
 }
 
 function detectWeb(doc, url) {
+	Z.debug("----------------CNKI 20231123-------------------");
 	var id = getIDFromPage(doc, url);
 	Z.debug(id);
 	if (id) {
@@ -212,7 +211,8 @@ function detectWeb(doc, url) {
 		url.match(/kns\/brief\/(default_)?result\.aspx/i)
 		|| url.includes("/KNavi/") // Article list in Navigation page
 		|| url.match(/kns8?s?\/defaultresult\/index/i) // search page
-		|| url.match(/KNS8?s?\/AdvSearch\?/i)) {// search page
+		|| url.match(/KNS8?s?\/AdvSearch\?/i)// search page
+		|| url.match(/kns8?s?\/search\?/i)) {
 		return "multiple";
 	}
 	else {
@@ -221,7 +221,6 @@ function detectWeb(doc, url) {
 }
 
 async function doWeb(doc, url) {
-	Z.debug("----------------CNKI 20231121-------------------");
 	if (detectWeb(doc, url) == "multiple") {
 		var itemInfo = {};
 		var items = getItemsFromSearchResults(doc, url, itemInfo);