RanchiMall/exchangemarket
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
sairajzero 2019-12-19 20:31:30 +05:30
parent 8f3ef66d15
commit afa8714d0e
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
standard_Operations.html
View File

@ -6833,7 +6833,8 @@
</script> </script>
<script id="floCloudAPI"> <script id="floCloudAPI">
/* FLO Cloud operations to send/request application data*/ /* FLO Cloud operations to send/request application data*/
floCloudAPI = { const floCloudAPI = {
//send Any message to supernode cloud storage //send Any message to supernode cloud storage
sendApplicationData: function(message, type, options = {}){ sendApplicationData: function(message, type, options = {}){
return new Promise((resolve,reject) => { return new Promise((resolve,reject) => {
@ -6873,6 +6874,7 @@
}) })
}, },
//send General Data
sendGeneralData: function(message, type, options = {}){ sendGeneralData: function(message, type, options = {}){
this.sendApplicationData(message, type, options) this.sendApplicationData(message, type, options)
.then(result => reactor.dispatchEvent('logHandle',result)) .then(result => reactor.dispatchEvent('logHandle',result))
@ -6929,7 +6931,7 @@
division: options.division || floGlobals.division, division: options.division || floGlobals.division,
object: objectName, object: objectName,
vectorClock: floGlobals.vectorClock[objectName], vectorClock: floGlobals.vectorClock[objectName],
diff: detailedDiff(oldObject, newObject) diff: findDifference(oldObject, newObject)
} }
this.sendApplicationData(message, `${objectName}@Update`, options) this.sendApplicationData(message, `${objectName}@Update`, options)
.then(result => reactor.dispatchEvent('logHandle',result)) .then(result => reactor.dispatchEvent('logHandle',result))
@ -6948,8 +6950,8 @@
if(message.reset){ if(message.reset){
floGlobals.appObjects[message.object] = message.reset floGlobals.appObjects[message.object] = message.reset
floGlobals.vectorClock[message.object] = vc floGlobals.vectorClock[message.object] = vc
//compactIDB.writeData("appObjects", floGlobals.appObjects[message.object], message.object) compactIDB.writeData("appObjects", floGlobals.appObjects[message.object], message.object)
//compactIDB.writeData("vectorClocks", vc, message.object) compactIDB.writeData("vectorClocks", vc, message.object)
} }
//} //}
} }
@ -6967,12 +6969,12 @@
//if(floGlobals.subAdmins.includes(dataSet[vc].senderID)){ //if(floGlobals.subAdmins.includes(dataSet[vc].senderID)){
var message = dataSet[vc].message; var message = dataSet[vc].message;
if(message.diff){ if(message.diff){
floGlobals.appObjects[message.object] = mergeAllDiff(floGlobals.appObjects[message.object], message.diff) floGlobals.appObjects[message.object] = mergeDifference(floGlobals.appObjects[message.object], message.diff)
//compactIDB.writeData("appObjects",floGlobals.appObjects[message.object], message.object) compactIDB.writeData("appObjects",floGlobals.appObjects[message.object], message.object)
} }
//} //}
floGlobals.vectorClock[message.object] = vc floGlobals.vectorClock[message.object] = vc
//compactIDB.writeData("vectorClocks", vc, message.object) compactIDB.writeData("vectorClocks", vc, message.object)
} }
}catch(error){ }catch(error){
console.log(error) console.log(error)
@ -6987,10 +6989,10 @@
if(!Array.isArray(floGlobals.generalData[event.filterStr])) if(!Array.isArray(floGlobals.generalData[event.filterStr]))
floGlobals.generalData[event.filterStr] = [] floGlobals.generalData[event.filterStr] = []
for(vc in dataSet){ for(vc in dataSet){
floGlobals.generalData[event.filterStr].push({sender: dataSet[vc].senderID, message: dataSet[vc].message}) floGlobals.generalData[event.filterStr].push({sender: dataSet[vc].senderID, vectorClock: vc, message: dataSet[vc].message})
//compactIDB.writeData("generalData", floGlobals.generalData[event.filterStr], event.filterStr) compactIDB.writeData("generalData", floGlobals.generalData[event.filterStr], event.filterStr)
floGlobals.generalVC[event.filterStr] = vc floGlobals.generalVC[event.filterStr] = vc
//compactIDB.writeData("generalVC", vc, event.filterStr) compactIDB.writeData("generalVC", vc, event.filterStr)
} }
}catch(error){ }catch(error){
console.log(error) console.log(error)