Bentley James Oakes vor 7 Jahren
Ursprung
Commit
93a87506cd
3 geänderte Dateien mit 31 neuen und 9 gelöschten Zeilen
  1. 12 5
      __worker.js
  2. 16 2
      csworker.js
  3. 3 2
      mmmk.js

+ 12 - 5
__worker.js

@@ -106,14 +106,10 @@
 
 /**************************** LIBRARIES and GLOBALS ****************************/
 var  _util 	= require('util'),
-	 //_path 	= require('path'),
 	 _http 	= require('http'),
 	 _do  	= require('./___do'),
 	 _fs 	 	= _do.convert(require('fs'), ['readFile', 'writeFile', 'readdir']),
-	//_fspp	= _do.convert(require('./___fs++'), ['mkdirs']),
 	 _utils	= require('./utils'),
-	 //_styleinfo = require('./styleinfo'),
-	 //_svg		= require('./libsvg').SVG,
 	 _wlib,
 	 _mmmk,
 	 _mt,
@@ -840,9 +836,20 @@ module.exports = {
 	__wHttpReq,
 
 	__postInternalErrorMsg,
+	__postForbiddenErrorMsg,
+	__postBadReqErrorMsg,
 	__sequenceNumber,
 
 	__postMessage,
-	__uri_to_id
+	__uri_to_id,
+	__id_to_uri,
+	__batchCheckpoint,
+
+	GET__current_state,
+
+	//GLOBAL VARS
+	__ids2uris,
+	__nextSequenceNumber,
+	__wtype,
 
 };

+ 16 - 2
csworker.js

@@ -177,7 +177,17 @@
 			SYSOUT message announcing the launching of the rule... a sensible and 
 		  	nice solution would be not to remember such changelogs in
 			__handledSeqNums */
+let {
+    __id_to_uri,
+    __ids2uris, __nextSequenceNumber,
+    __postBadReqErrorMsg,
+    __postForbiddenErrorMsg,
+    __wtype,
+    GET__current_state
+} = require("./__worker");
+
 const {
+	__batchCheckpoint,
     __errorContinuable,
     __httpReq,
 	__wHttpReq,
@@ -191,6 +201,10 @@ const _do = require("./___do");
 const _utils = require('./utils');
 const _mmmk = require("./mmmk");
 const _fs = _do.convert(require('fs'), ['readFile', 'writeFile', 'readdir']);
+const _path = require('path');
+const _fspp	= _do.convert(require('./___fs++'), ['mkdirs']);
+const _svg = require('./libsvg').SVG;
+const _mt = require('./libmt');
 
 const _siocl = require('socket.io-client');
 
@@ -1893,9 +1907,9 @@ module.exports = {
 					{
 						var sn = asdata['sequence#'];
 						if( self.__nextASWSequenceNumber - 1 > sn )
-							self['PUT *.model'](resp,urin);
+							self['PUT *.model'](resp,uri);
 						else if( self.__nextASWSequenceNumber - 1 < sn )
-							setTimeout(self['PUT *.model'], 200, resp, urin);
+							setTimeout(self['PUT *.model'], 200, resp, uri);
 						else
 						{
 							if( (res = _mmmk.read())['$err'] )

+ 3 - 2
mmmk.js

@@ -14,6 +14,7 @@
 const _utils = require('./utils');
 const _util = require("util");
 const _mt = require("./libmt");
+const _styleinfo = require('./styleinfo');
 
 module.exports = {
 	/********************************* GLOBALS *********************************/
@@ -1530,8 +1531,8 @@ module.exports = {
 			else if( log == 'UNDOREDO' )
 				this.undoredoJournal.push(step);
 
-			else if( log == 'DONTLOG' )
-				;
+			//else if( log == 'DONTLOG' )
+			//	;
 		},