From 7f0dbc610f2fb25868123abf4a19fbda50629bab Mon Sep 17 00:00:00 2001
From: "teppy@egenesis.com" <teppy@egenesis.com>
Date: Sun, 15 Oct 2023 22:14:32 -0400
Subject: [PATCH 1/3] changes

---
 filechunker.js | 26 ++++++++++++++++++++++++++
 plurvote.html  |  2 +-
 rangevote.html |  2 +-
 rangevote.js   |  2 +-
 4 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 filechunker.js

diff --git a/filechunker.js b/filechunker.js
new file mode 100644
index 0000000..8cd2285
--- /dev/null
+++ b/filechunker.js
@@ -0,0 +1,26 @@
+fs=require("fs")
+
+class FileChunker {
+    constructor(fname) {
+	this.Chunks=[];
+	let Template=fs.readFileSync(fname).toString();
+	let pattern="<!-- INJECT -->";
+	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));
+		offset=-1;
+	    }
+	} while (offset>0);
+    }
+}
+
+module.exports=FileChunker;
+
diff --git a/plurvote.html b/plurvote.html
index 05055c7..bdd5ac1 100644
--- a/plurvote.html
+++ b/plurvote.html
@@ -26,7 +26,7 @@
 	<th> </th>
 	<th>Candidate</th>
       </tr>
-<!-- INJECT0 -->
+<!-- INJECT -->
     </table>
     
     <br>
diff --git a/rangevote.html b/rangevote.html
index 3785b81..13370c2 100644
--- a/rangevote.html
+++ b/rangevote.html
@@ -27,7 +27,7 @@
 	<th style="width:50%"><span id="spanid"> </th>
 	<th>Happiness</th>
       </tr>
-<!-- INJECT0 -->
+<!-- INJECT -->
     </table>
     
     <br>
diff --git a/rangevote.js b/rangevote.js
index e5c8277..6a00b5a 100644
--- a/rangevote.js
+++ b/rangevote.js
@@ -2,10 +2,10 @@ var express = require('express')
 var bodyParser = require('body-parser')
 var fs=require('fs')
 var hashindex=require('hash-index')
+var fc=require("./filechunker.js");
 
 var app = express()
 
-
 var Candidates=[
     "Chris Christie",
     "Donald Trump",

From e2a30c4858e5fa9b129c1726530d4085c716044c Mon Sep 17 00:00:00 2001
From: teppy999 <teppy@egenesis.com>
Date: Wed, 18 Oct 2023 08:17:57 -0400
Subject: [PATCH 2/3] changes

---
 .#filechunker.js | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .#filechunker.js

diff --git a/.#filechunker.js b/.#filechunker.js
new file mode 100644
index 0000000..2e718df
--- /dev/null
+++ b/.#filechunker.js
@@ -0,0 +1 @@
+teppy@DESKTOP-EAKVHTK.25700:1695612744
\ No newline at end of file

From 69bb15c46d06bae2480526bd9682572d79ed7738 Mon Sep 17 00:00:00 2001
From: teppy999 <teppy@egenesis.com>
Date: Wed, 18 Oct 2023 08:52:39 -0400
Subject: [PATCH 3/3] changes

---
 .#filechunker.js |  1 -
 filechunker.js   |  2 --
 rangevote.js     | 15 ++++++---------
 3 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 .#filechunker.js

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+'      <tr>'+
 	'          <td>'+c+'</td><td><input style="width:95%" type="range" min="-1" max="100" value="-1" id="i-'+CanId(c)+'" name="n-'+CanId(c)+'" /></td><td><span id="o-'+CanId(c)+'">No Opinion</span></td></tr>\n';
 }
-var TemplateHTML=fs.readFileSync("rangevote.html").toString();
-var TemplateSearch="<!-- INJECT0 -->";
-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+'      <tr>'+
 	'          <td><input type="radio" value="v-'+CanId(c)+'" name="pick" /></td><td>'+c+'</td></tr>\n';
 }
-TemplateHTML=fs.readFileSync("plurvote.html").toString();
-TemplateSearch="<!-- INJECT0 -->";
-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)
     {