From 6f0604815d65b383ee9caebe69cfb17b116f62a8 Mon Sep 17 00:00:00 2001
From: "Alexander.Trofimov" <Alexander.Trofimov@onlyoffice.com>
Date: Wed, 26 Feb 2014 10:29:39 +0000
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B2=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D1=8B?=
 =?UTF-8?q?=20=D1=81=D0=BE=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BD=D0=BE=D0=B3?=
 =?UTF-8?q?=D0=BE=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20documentFormatSave?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/nodeJSProjects@54653 954022d7-b5bf-4e40-9824-e11837661b57
---
 CoAuthoring/sources/DocsCoServer.js | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/CoAuthoring/sources/DocsCoServer.js b/CoAuthoring/sources/DocsCoServer.js
index b561adb8..f39c2acb 100644
--- a/CoAuthoring/sources/DocsCoServer.js
+++ b/CoAuthoring/sources/DocsCoServer.js
@@ -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 ();
 	});