pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-04-07 14:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

add doctparams

Browse Source 
git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/nodeJSProjects@68182 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Sergey.Konovalov
2016-02-12 14:22:41 +00:00
committed by Alexander.Trofimov
parent 977dd7e014
commit 198e1eaf59
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Common/sources/commondefines.js
View File

@ -29,6 +29,7 @@ function InputCommand(data) {
this['savekey'] = data['savekey'];
this['userconnectionid'] = data['userconnectionid'];
this['docconnectionid'] = data['docconnectionid'];
this['doctparams'] = data['doctparams'];
} else {
this['c'] = undefined;//string command
this['id'] = undefined;//string document id
@ -57,6 +58,7 @@ function InputCommand(data) {
this['savekey'] = undefined;//int document id to save
this['userconnectionid'] = undefined;//string internal
this['docconnectionid'] = undefined;//string internal
this['doctparams'] = undefined;//int doctRenderer
}
}
InputCommand.prototype = {
@ -197,6 +199,12 @@ InputCommand.prototype = {
},
setDocConnectionId: function(data) {
this['docconnectionid'] = data;
},
getDoctParams: function() {
return this['doctparams'];
},
setDoctParams: function(data) {
this['doctparams'] = data;
}
};

1
DocService/sources/converterservice.js
View File

@ -133,6 +133,7 @@ function convertRequest(req, res) {
cmd.setOutputFormat(formatChecker.getFormatFromString(outputtype));
cmd.setCodepage(commonDefines.c_oAscEncodingsMap[req.query['codePage']] || commonDefines.c_oAscCodePageUtf8);
cmd.setDelimiter(req.query['delimiter'] || commonDefines.c_oAscCsvDelimiter.Comma);
cmd.setDoctParams(req.query['doctparams']);
var async = 'true' == req.query['async'];
var status = yield* convertByCmd(cmd, async, utils.getBaseUrlByRequest(req));

2
FileConverter/sources/converter.js
View File

@ -49,6 +49,7 @@ function TaskQueueDataConvert(task) {
this.fontDir = path.resolve(cfgFontDir);
this.themeDir = path.resolve(cfgPresentationThemesDir);
this.mailMergeSend = cmd.mailmergesend;
this.doctParams = cmd.getDoctParams();
this.timestamp = new Date();
}
TaskQueueDataConvert.prototype = {
@ -70,6 +71,7 @@ TaskQueueDataConvert.prototype = {
if (this.mailMergeSend) {
xml += this.serializeMailMerge(this.mailMergeSend);
}
xml += this.serializeXmlProp('m_nDoctParams', this.doctParams);
xml += this.serializeXmlProp('m_oTimestamp', this.timestamp.toISOString());
xml += '</TaskQueueDataConvert>';
fs.writeFileSync(fsPath, xml, {encoding: 'utf8'});