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

Добавил в параметры совместного редактирования documentFormatSave

Browse Source 
git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/nodeJSProjects@54653 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Alexander.Trofimov
2014-02-26 10:29:39 +00:00
parent 8e00735bdb
commit 6f0604815d
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CoAuthoring/sources/DocsCoServer.js
View File

@ -251,10 +251,10 @@ exports.install = function (server, callbackFunction) {
// На всякий случай снимаем lock
arrsavelock[conn.docId] = undefined;
// ToDo Send changes to save server
// Send changes to save server
if (objchanges[conn.docId] && 0 < objchanges[conn.docId].length) {
saveTimers[conn.docId] = setTimeout(function () {
sendChangesToServer(conn.serverHost, conn.serverPath, conn.docId);
sendChangesToServer(conn.serverHost, conn.serverPath, conn.docId, conn.documentFormatSave);
}, c_oAscSaveTimeOutDelay);
}
}
@ -327,7 +327,7 @@ exports.install = function (server, callbackFunction) {
});
}
function sendChangesToServer(serverHost, serverPath, docId) {
function sendChangesToServer(serverHost, serverPath, docId, documentFormatSave) {
if (!serverHost || !serverPath)
return;
// Пошлем пока только информацию о том, что нужно сбросить кеш
@ -346,7 +346,7 @@ exports.install = function (server, callbackFunction) {
logger.warn('problem with request on server: ' + e.message);
});
var sendData = JSON.stringify({'id': docId, 'c': 'sfc', 'url': '/removechanges.html?id=' + docId});
var sendData = JSON.stringify({'id': docId, 'c': 'sfc', 'url': '/removechanges.html?id=' + docId, 'documentFormatSave': documentFormatSave});
// write data to request body
req.write(sendData);
@ -518,6 +518,7 @@ exports.install = function (server, callbackFunction) {
conn.userName = data.username;
conn.serverHost = data.serverHost;
conn.serverPath = data.serverPath;
conn.documentFormatSave = data.documentFormatSave;
//Set the unique ID
if (data.sessionId !== null && _.isString(data.sessionId) && data.sessionId !== "") {
logger.info("restored old session id=" + data.sessionId);
@ -911,8 +912,8 @@ exports.install = function (server, callbackFunction) {
var callbackLoadChangesMySql = (function (arrayElements){
if (null != arrayElements) {
// add elements
var docId, data, objchange;
for (var i = 0; i < arrayElements.length; ++i) {
var docId, data, objchange, i;
for (i = 0; i < arrayElements.length; ++i) {
docId = arrayElements[i].docid;
try {
objchange = {docid:docId, changes:arrayElements[i].data}; // Пишем пока без времени и пользователя (это не особо нужно)
@ -922,6 +923,15 @@ exports.install = function (server, callbackFunction) {
objchanges[docId].push(objchange);
} catch (e) {}
}
// ToDo - send
/*for (i in objchange) if (objchange.hasOwnProperty(i)) {
// Send changes to save server
if (objchanges[i] && 0 < objchanges[i].length) {
saveTimers[i] = setTimeout(function () {
sendChangesToServer(conn.serverHost, conn.serverPath, i, conn.documentFormatSave);
}, c_oAscSaveTimeOutDelay);
}
}*/
}
callbackFunction ();
});