Skip to content
Snippets Groups Projects
Commit 022e65c9 authored by rswindell's avatar rswindell
Browse files

Fix bugs in initial commit:

- typo "tickit" not "ticket"
- convert ini content array to object to create map
parent ae61f665
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"use strict"; "use strict";
var init_ini = js.exec_dir + "init-ticket.ini"; var init_ini = js.exec_dir + "init-tickit.ini";
var tickit_ini = system.ctrl_dir + "tickit.ini"; var tickit_ini = system.ctrl_dir + "tickit.ini";
var ini = []; var ini = [];
...@@ -24,23 +24,26 @@ if(!f.open("w")) { ...@@ -24,23 +24,26 @@ if(!f.open("w")) {
alert("Error " + f.error + " opening " + f.name); alert("Error " + f.error + " opening " + f.name);
exit(1); exit(1);
} }
var list = {};
for(var i in ini) {
list[ini[i].name] = ini[i];
}
for(var code in file_area.dir) { for(var code in file_area.dir) {
var area = file_area.dir[code]; var area = file_area.dir[code];
var ticline; var ticline;
f.writeln('[' + area.name + "]\nDir=" + code.toUpperCase()); f.writeln('[' + area.name + "]\nDir=" + code.toUpperCase());
if (ini[area.name]) { if (list[area.name]) {
if(ini[area.name].domain) { if(list[area.name].domain) {
f.writeln('Handler=tickit/nodelist_handler.js'); f.writeln('Handler=tickit/nodelist_handler.js');
ticline = 'HandlerArg={"domain":"' + ini[area.name].domain + '"'; ticline = 'HandlerArg={"domain":"' + list[area.name].domain + '"';
if (ini[area.name].match) { if (list[area.name].match) {
ticline += ' ,"match":"' + ini[area.name].match + '"'; ticline += ' ,"match":"' + list[area.name].match + '"';
} }
ticline += ', "nlmatch":"' + ini[area.name].nlmatch + '"}'; ticline += ', "nlmatch":"' + list[area.name].nlmatch + '"}';
f.writeln(ticline); f.writeln(ticline);
} }
if (ini[area.name].forcereplace) if (list[area.name].forcereplace)
f.writeln('Forcereplace = true'); f.writeln('Forcereplace = true');
} }
f.writeln(); f.writeln();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment