Mvolz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201712
Change subject: [WIP] Fix Scrape to output correct format
......................................................................
[WIP] Fix Scrape to output correct format
Scrape in CitoidService.js was only correctly
exporting to bibtex and was not exporting the
internal zotero format to mediawiki nor
MWDeprecated.
This fixes it but it's messy works.
Bug:T95004
Change-Id: Id32cd5a9968ae6109984b05b86b9dd5321dfeff4
---
M lib/CitoidService.js
M package.json
2 files changed, 10 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid
refs/changes/12/201712/1
diff --git a/lib/CitoidService.js b/lib/CitoidService.js
index 05280b5..e1f8072 100644
--- a/lib/CitoidService.js
+++ b/lib/CitoidService.js
@@ -342,6 +342,7 @@
var format = opts.format;
var scrape = this.scraper.scrape.bind(this.scraper);
var zoteroExportRequest =
this.zoteroService.zoteroExportRequest.bind(this.zoteroService);
+ var selectFormatFcn =
this.zoteroService.selectFormatFcn.bind(this.zoteroService);
if (format === 'bibtex') {
scrape(opts, function(error, scrapeResCode, citation) {
@@ -360,7 +361,14 @@
});
});
} else {
- scrape(opts, callback);
+ scrape(opts, function(error, scrapeResCode, citation) {
+ selectFormatFcn(format, function(convert){
+ convert(opts.search, format, citation,
function(citation){
+ cbResCode = scrapeResCode;
+ callback(error, cbResCode, citation);
+ });
+ });
+ });
}
};
diff --git a/package.json b/package.json
index e283dd8..fe8a9bf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "citoid",
- "version": "0.2.5",
+ "version": "0.2.6",
"description": "Converts search terms such as URL or DOI into citations.",
"scripts": {
"start": "service-runner",
--
To view, visit https://gerrit.wikimedia.org/r/201712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id32cd5a9968ae6109984b05b86b9dd5321dfeff4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Mvolz <mv...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
