diff --git a/.#filechunker.js b/.#filechunker.js deleted file mode 100644 index 2e718df..0000000 --- a/.#filechunker.js +++ /dev/null @@ -1 +0,0 @@ -teppy@DESKTOP-EAKVHTK.25700:1695612744 \ No newline at end of file diff --git a/filechunker.js b/filechunker.js index 8cd2285..36dd2f5 100644 --- a/filechunker.js +++ b/filechunker.js @@ -8,11 +8,9 @@ class FileChunker { let offset=0; do { let nextOffset=Template.indexOf(pattern,offset); - console.log("Nextoffset:"+nextOffset); if (nextOffset>=0) { this.Chunks.push(Template.substring(offset,nextOffset)); offset=nextOffset+pattern.length; - console.log("Offset:"+offset); } else { this.Chunks.push(Template.substring(offset)); diff --git a/rangevote.js b/rangevote.js index 6a00b5a..12bb923 100644 --- a/rangevote.js +++ b/rangevote.js @@ -6,6 +6,9 @@ var fc=require("./filechunker.js"); var app = express() +var TemplateVoteRange=new fc("./rangevote.html"); +var TemplateVotePlur =new fc("./plurvote.html"); + var Candidates=[ "Chris Christie", "Donald Trump", @@ -94,10 +97,8 @@ for (let c of Candidates) RangeHTML=RangeHTML+' '+ ' '+c+'No Opinion\n'; } -var TemplateHTML=fs.readFileSync("rangevote.html").toString(); -var TemplateSearch=""; -var TemplateIndex=TemplateHTML.indexOf(TemplateSearch); -RangeHTML=TemplateHTML.substr(0,TemplateIndex)+RangeHTML+TemplateHTML.substr(TemplateIndex+TemplateSearch.length,1000000); +RangeHTML=TemplateVoteRange.Chunks[0]+RangeHTML+TemplateVoteRange.Chunks[1]; + // Construct the static page for Plurality Voting var PlurHTML=""; @@ -106,10 +107,7 @@ for (let c of Candidates) PlurHTML=PlurHTML+' '+ ' '+c+'\n'; } -TemplateHTML=fs.readFileSync("plurvote.html").toString(); -TemplateSearch=""; -TemplateIndex=TemplateHTML.indexOf(TemplateSearch); -PlurHTML=TemplateHTML.substr(0,TemplateIndex)+PlurHTML+TemplateHTML.substr(TemplateIndex+TemplateSearch.length,1000000); +PlurHTML=TemplateVotePlur.Chunks[0]+PlurHTML+TemplateVotePlur.Chunks[1]; // create application/json parser @@ -159,7 +157,6 @@ function AddToRangeResult(vote,mult=1) function RangeVote(ip,entries) { - console.log('IP: '+ip); let r0=null,r1=null; for (let [key,val] of entries) if (typeof(key)=="string" && val>=0) {