summaryrefslogtreecommitdiff
path: root/frontend/gamma/js/Clipperz/CSVProcessor.js
Unidiff
Diffstat (limited to 'frontend/gamma/js/Clipperz/CSVProcessor.js') (more/less context) (ignore whitespace changes)
-rw-r--r--frontend/gamma/js/Clipperz/CSVProcessor.js78
1 files changed, 38 insertions, 40 deletions
diff --git a/frontend/gamma/js/Clipperz/CSVProcessor.js b/frontend/gamma/js/Clipperz/CSVProcessor.js
index 0b18731..1288ed7 100644
--- a/frontend/gamma/js/Clipperz/CSVProcessor.js
+++ b/frontend/gamma/js/Clipperz/CSVProcessor.js
@@ -1,25 +1,23 @@
1/* 1/*
2 2
3Copyright 2008-2011 Clipperz Srl 3Copyright 2008-2013 Clipperz Srl
4 4
5This file is part of Clipperz Community Edition. 5This file is part of Clipperz, the online password manager.
6Clipperz Community Edition is an online password manager.
7For further information about its features and functionalities please 6For further information about its features and functionalities please
8refer to http://www.clipperz.com. 7refer to http://www.clipperz.com.
9 8
10* Clipperz Community Edition is free software: you can redistribute 9* Clipperz is free software: you can redistribute it and/or modify it
11 it and/or modify it under the terms of the GNU Affero General Public 10 under the terms of the GNU Affero General Public License as published
12 License as published by the Free Software Foundation, either version 11 by the Free Software Foundation, either version 3 of the License, or
13 3 of the License, or (at your option) any later version. 12 (at your option) any later version.
14 13
15* Clipperz Community Edition is distributed in the hope that it will 14* Clipperz is distributed in the hope that it will be useful, but
16 be useful, but WITHOUT ANY WARRANTY; without even the implied 15 WITHOUT ANY WARRANTY; without even the implied warranty of
17 warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
18 See the GNU Affero General Public License for more details. 17 See the GNU Affero General Public License for more details.
19 18
20* You should have received a copy of the GNU Affero General Public 19* You should have received a copy of the GNU Affero General Public
21 License along with Clipperz Community Edition. If not, see 20 License along with Clipperz. If not, see http://www.gnu.org/licenses/.
22 <http://www.gnu.org/licenses/>.
23 21
24*/ 22*/
25 23
@@ -95,7 +93,7 @@ Clipperz.CSVProcessor.prototype = MochiKit.Base.update(null, {
95 var lines; 93 var lines;
96 var parameter; 94 var parameter;
97 95
98//MochiKit.Logging.logDebug(">>> CSVProcessor.parse"); 96//Clipperz.logDebug(">>> CSVProcessor.parse");
99 result = []; 97 result = [];
100 98
101 lines = aValue.replace(/\r?\n/g, "\n").replace(/^\n* /g, "").replace(/\n$/g, "");; 99 lines = aValue.replace(/\r?\n/g, "\n").replace(/^\n* /g, "").replace(/\n$/g, "");;
@@ -114,10 +112,10 @@ Clipperz.CSVProcessor.prototype = MochiKit.Base.update(null, {
114 112
115 parameter.line = parameter.line.replace(/^\n* /g, "").replace(/\n$/g, ""); 113 parameter.line = parameter.line.replace(/^\n* /g, "").replace(/\n$/g, "");
116 114
117//MochiKit.Logging.logDebug("line: '" + parameter.line + "'"); 115//Clipperz.logDebug("line: '" + parameter.line + "'");
118 } while (parameter.line != ""); 116 } while (parameter.line != "");
119//MochiKit.Logging.logDebug("--- CSVProcessor.parse - result: " + Clipperz.Base.serializeJSON(result)); 117//Clipperz.logDebug("--- CSVProcessor.parse - result: " + Clipperz.Base.serializeJSON(result));
120//MochiKit.Logging.logDebug("<<< CSVProcessor.parse"); 118//Clipperz.logDebug("<<< CSVProcessor.parse");
121 119
122 return result; 120 return result;
123 }, 121 },
@@ -216,7 +214,7 @@ Clipperz.CSVProcessor.prototype = MochiKit.Base.update(null, {
216 214
217 inQuotes = false; 215 inQuotes = false;
218 216
219//MochiKit.Logging.logDebug("#################################### '" + aParameter.line + "'"); 217//Clipperz.logDebug("#################################### '" + aParameter.line + "'");
220 if (aParameter.line == "") { 218 if (aParameter.line == "") {
221 if (aParameter.isThereAnEmptyFinalField == true) { 219 if (aParameter.isThereAnEmptyFinalField == true) {
222 aParameter.isThereAnEmptyFinalField = false; 220 aParameter.isThereAnEmptyFinalField = false;
@@ -240,31 +238,31 @@ Clipperz.CSVProcessor.prototype = MochiKit.Base.update(null, {
240 238
241 while (!done) { 239 while (!done) {
242 if (aParameter.line.length < 1) { 240 if (aParameter.line.length < 1) {
243//MochiKit.Logging.logDebug("---> 1: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 241//Clipperz.logDebug("---> 1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
244 if (inQuotes == true) { 242 if (inQuotes == true) {
245//MochiKit.Logging.logDebug("---> 1.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 243//Clipperz.logDebug("---> 1.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
246 throw new Error("CSV Parsing error; end of string, missing closing double-quote..."); 244 throw new Error("CSV Parsing error; end of string, missing closing double-quote...");
247 } else { 245 } else {
248//MochiKit.Logging.logDebug("---> 1.2: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 246//Clipperz.logDebug("---> 1.2: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
249 done = true; 247 done = true;
250 } 248 }
251 } else if (escapedQuoteBeginRegexp.test(aParameter.line)) { 249 } else if (escapedQuoteBeginRegexp.test(aParameter.line)) {
252//MochiKit.Logging.logDebug("---> 2.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 250//Clipperz.logDebug("---> 2.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
253 result += this.quoteChar(); 251 result += this.quoteChar();
254 aParameter.line = aParameter.line.substr(2, aParameter.line.length - 1); 252 aParameter.line = aParameter.line.substr(2, aParameter.line.length - 1);
255//MochiKit.Logging.logDebug("<--- 2.2: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 253//Clipperz.logDebug("<--- 2.2: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
256 } else if (singleQuoteBeginRegexp.test(aParameter.line)) { 254 } else if (singleQuoteBeginRegexp.test(aParameter.line)) {
257//MochiKit.Logging.logDebug("---> 3: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 255//Clipperz.logDebug("---> 3: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
258 if (inQuotes == true) { 256 if (inQuotes == true) {
259 if (aParameter.line.length == 1) { 257 if (aParameter.line.length == 1) {
260//MochiKit.Logging.logDebug("---> 3.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 258//Clipperz.logDebug("---> 3.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
261 aParameter.line = ''; 259 aParameter.line = '';
262 done = true; 260 done = true;
263 } else if (singleQuoteCommaEndRegexp.test(aParameter.line)) { 261 } else if (singleQuoteCommaEndRegexp.test(aParameter.line)) {
264//MochiKit.Logging.logDebug("---> 3.3: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 262//Clipperz.logDebug("---> 3.3: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
265 aParameter.line = aParameter.line.substr(2, aParameter.line.length - 1); 263 aParameter.line = aParameter.line.substr(2, aParameter.line.length - 1);
266 done = true; 264 done = true;
267//MochiKit.Logging.logDebug("<--- 3.3: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 265//Clipperz.logDebug("<--- 3.3: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
268 } else if (singleQuoteNewLineEndRegexp.test(aParameter.line)) { 266 } else if (singleQuoteNewLineEndRegexp.test(aParameter.line)) {
269 aParameter.line = aParameter.line.substr(1, aParameter.line.length - 1); 267 aParameter.line = aParameter.line.substr(1, aParameter.line.length - 1);
270 done = true; 268 done = true;
@@ -272,38 +270,38 @@ Clipperz.CSVProcessor.prototype = MochiKit.Base.update(null, {
272 throw new Error("CSV Parsing error; double-quote, followed by undesirable character (bad character sequence)... " + aParameter.line); 270 throw new Error("CSV Parsing error; double-quote, followed by undesirable character (bad character sequence)... " + aParameter.line);
273 } 271 }
274 } else { 272 } else {
275//MochiKit.Logging.logDebug("---> 4: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 273//Clipperz.logDebug("---> 4: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
276 if (result == "") { 274 if (result == "") {
277//MochiKit.Logging.logDebug("---> 4.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 275//Clipperz.logDebug("---> 4.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
278 inQuotes = true; 276 inQuotes = true;
279 aParameter.line = aParameter.line.substr(1, aParameter.line.length - 1); 277 aParameter.line = aParameter.line.substr(1, aParameter.line.length - 1);
280//MochiKit.Logging.logDebug("<--- 4.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 278//Clipperz.logDebug("<--- 4.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
281 } else { 279 } else {
282 throw new Error("CSV Parsing error; double-quote, outside of double-quotes (bad character sequence)..."); 280 throw new Error("CSV Parsing error; double-quote, outside of double-quotes (bad character sequence)...");
283 } 281 }
284 } 282 }
285 } else if (commaBeginRegexp.test(aParameter.line)) { 283 } else if (commaBeginRegexp.test(aParameter.line)) {
286//MochiKit.Logging.logDebug("---> 5: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 284//Clipperz.logDebug("---> 5: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
287 if (inQuotes) { 285 if (inQuotes) {
288//MochiKit.Logging.logDebug("---> 5.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 286//Clipperz.logDebug("---> 5.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
289 result += aParameter.line.substr(0 ,1); 287 result += aParameter.line.substr(0 ,1);
290 aParameter.line = aParameter.line.substr(1, aParameter.line.length - 1); 288 aParameter.line = aParameter.line.substr(1, aParameter.line.length - 1);
291//MochiKit.Logging.logDebug("<--- 5.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 289//Clipperz.logDebug("<--- 5.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
292 } else { 290 } else {
293//MochiKit.Logging.logDebug("---> 5.2: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 291//Clipperz.logDebug("---> 5.2: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
294 aParameter.line = aParameter.line.substr(1, aParameter.line.length - 1); 292 aParameter.line = aParameter.line.substr(1, aParameter.line.length - 1);
295 if (newlineRegexp.test(aParameter.line) || aParameter.line == "") { 293 if (newlineRegexp.test(aParameter.line) || aParameter.line == "") {
296//MochiKit.Logging.logDebug("######"); 294//Clipperz.logDebug("######");
297 aParameter.isThereAnEmptyFinalField = true; 295 aParameter.isThereAnEmptyFinalField = true;
298 }; 296 };
299 done = true; 297 done = true;
300//MochiKit.Logging.logDebug("<--- 5.2: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 298//Clipperz.logDebug("<--- 5.2: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
301 } 299 }
302 } else if (validRegexp.test(aParameter.line)) { 300 } else if (validRegexp.test(aParameter.line)) {
303//MochiKit.Logging.logDebug("---> 6: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 301//Clipperz.logDebug("---> 6: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
304 result += aParameter.line.substr(0, 1); 302 result += aParameter.line.substr(0, 1);
305 aParameter.line = aParameter.line.substr(1, aParameter.line.length - 1); 303 aParameter.line = aParameter.line.substr(1, aParameter.line.length - 1);
306//MochiKit.Logging.logDebug("<--- 6: '" + aParameter.line.replace(/\n/g, "\\n") + "'"); 304//Clipperz.logDebug("<--- 6: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
307 } else if (newlineRegexp.test(aParameter.line)) { 305 } else if (newlineRegexp.test(aParameter.line)) {
308 if (inQuotes == true) { 306 if (inQuotes == true) {
309 result += aParameter.line.substr(0 ,1); 307 result += aParameter.line.substr(0 ,1);
@@ -324,16 +322,16 @@ Clipperz.CSVProcessor.prototype = MochiKit.Base.update(null, {
324 } 322 }
325 } 323 }
326 } catch(exception) { 324 } catch(exception) {
327 MochiKit.Logging.logError(exception.message); 325 Clipperz.logError(exception.message);
328 // result = null; 326 // result = null;
329 throw exception; 327 throw exception;
330 } 328 }
331 } 329 }
332 330
333//if (result != null) { 331//if (result != null) {
334 //MochiKit.Logging.logDebug("<=== result: '" + result.replace(/\n/g, "\\n") + "'"); 332 //Clipperz.logDebug("<=== result: '" + result.replace(/\n/g, "\\n") + "'");
335//} else { 333//} else {
336 //MochiKit.Logging.logDebug("<=== result: NULL"); 334 //Clipperz.logDebug("<=== result: NULL");
337//} 335//}
338 336
339 return result; 337 return result;