User:Abel/PersonalData.js - Revision history

Podehaye at 11:43, 4 June 2019

2019-06-04T11:43:59Z

Show changes

Abel at 10:34, 30 May 2019

2019-05-30T10:34:30Z

Abel at 09:12, 30 May 2019

2019-05-30T09:12:33Z

Abel at 18:20, 27 May 2019

2019-05-27T18:20:01Z

Abel at 18:08, 27 May 2019

2019-05-27T18:08:53Z

Abel at 17:53, 27 May 2019

2019-05-27T17:53:04Z

Show changes

Abel at 17:52, 27 May 2019

2019-05-27T17:52:28Z

Show changes

Abel at 15:04, 27 May 2019

2019-05-27T15:04:26Z

Abel at 14:46, 27 May 2019

2019-05-27T14:46:11Z

Abel at 14:37, 27 May 2019

2019-05-27T14:37:14Z

@@ Line 6: / Line 6: @@
 	// suppress console.log, switch to true for debug
-	var Debug_switch = true;
+	var Debug_switch = false;
 	// seemingly the Safari engine uses a somewhat different implementation of arguments for db.transaction and index.get
 	// because no browser on any mac / ios is allowed to use a different engine, rather than user agent, platform can be tested

@@ Line 6: / Line 6: @@
 	// suppress console.log, switch to true for debug
-	var Debug_switch = false;
+	var Debug_switch = true;
 	// seemingly the Safari engine uses a somewhat different implementation of arguments for db.transaction and index.get
 	// because no browser on any mac / ios is allowed to use a different engine, rather than user agent, platform can be tested
-	var iOS = !!navigator.platform && /Macintosh|MacIntel|MacPPC|Mac68K|Mac|iPad|iPhone|iPod/.test(navigator.platform);
+	var iOS = !!navigator.platform && /iPad|iPhone|iPod/.test(navigator.platform);
+	var Safari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
 	// deterministic hash generator for creating user id#s from usernames, should be replaced by something more functional (guaranteed to be transitively different)
 	hashCode = function(s) {
@@ Line 74: / Line 76: @@
 	// Mode 'remove from record' field1 field2
 	// retrieve record, splice/delete record.field1.field2, push back
 	async function Enquire( pddbname, record, sqitch, control_1, control_2, control_3 ) {
@@ Line 100: / Line 105: @@
 					var tx;
-					if ( iOS ) {
+					if ( iOS || Safari ) {
 						tx = db.transaction([pddbname], "readwrite");
 					} else {
@@ Line 111: / Line 116: @@
 					// Get the original record from the db...
 					var getRecord;
-					if ( iOS ) {
+					if ( iOS || Safari ) {
 					 	getRecord = index.get(record.id);
 					} else {

@@ Line 241: / Line 241: @@
 						if ( sqitch === "import record" ) {
 							if ( control_1 != undefined ) {
 								// Only import if control_1 is a non-empty object
 								if ( ( !Array.isArray(control_1) ) && ( Object.keys(control_1).length > 0 ) ) {
 									 Object.keys(control_1).forEach( function( importkey ){
-								 	        if (src.hasOwnProperty(importkey)) { inp_obj[importkey] = src[importkey] };
+									 		debuglog("importing " + importkey );
 									 })
 								store.put(inp_obj);

@@ Line 238: / Line 238: @@
 							debuglog(inp_obj);
 							store.put(inp_obj);
+						}

@@ Line 6: / Line 6: @@
 	// suppress console.log, switch to true for debug
-	var Debug_switch = true;
+	var Debug_switch = false;
 	var iOS = !!navigator.platform && /Macintosh|MacIntel|MacPPC|Mac68K|Mac|iPad|iPhone|iPod/.test(navigator.platform);

@@ Line 89: / Line 89: @@
 					var db = pddb.result;
 					var store = db.createObjectStore(pddbname, {keyPath: "id"});
-					var index;
+					var index = store.createIndex("NameIndex", ["id"]);
 				};
@@ Line 114: / Line 108: @@
 					// Get the original record from the db...
-					var getRecord = index.get(record.id);
+					var getRecord;
 					getRecord.onsuccess = function() {

@@ Line 7: / Line 7: @@
 	// suppress console.log, switch to true for debug
 	var Debug_switch = true;
+	var iOS = !!navigator.platform && /Macintosh|MacIntel|MacPPC|Mac68K|Mac|iPad|iPhone|iPod/.test(navigator.platform);
 	// deterministic hash generator for creating user id#s from usernames, should be replaced by something more functional (guaranteed to be transitively different)
 	hashCode = function(s) {
@@ Line 84: / Line 85: @@
 				// indexeddb internal mechanism for version tracking of schema
-				pddb.onupgradeneeded = function(evt) {
+				pddb.onupgradeneeded = function() {
 					console.log('upgrading database');
 					var db = pddb.result;
 					var store = db.createObjectStore(pddbname, {keyPath: "id"});
+					var index;
 						// shouldn't the index be the wiki.personaldata.io username?
+						if ( iOS ) {
-						var index = db.store.createIndex("NameIndex", ["id"]);
+							index = db.store.createIndex("NameIndex", ["id"]);
 				};
 				// Database successfully opened function.
-				pddb.onsuccess = function(xy) {
+				pddb.onsuccess = function() {
 					debuglog(pddb.result);
 					var db = pddb.result;
-					var tx = db.transaction([pddbname], "readwrite");
+					var tx;
 					var store = tx.objectStore(pddbname);
 					var index = store.index("NameIndex");
@@ Line 119: / Line 130: @@
 	// Mode 'checkin':
 	// record is retrieved from database, parameter record is pushed if not found
-							if ( getRecord.result !== undefined ) {
+							if ( getRecord.result != undefined ) {
 								debuglog("getting from store");
 								inp_obj = getRecord.result;
@@ Line 153: / Line 164: @@
 									if ( sqitch === "get record" ) {
 										inp_obj = undefined;
 									} else {
 										return undefined;
+									}
+								}
+							}