Fixed Merge issues

[vicar] / src / vicar-config-qml / qml / vicarconfigqml / Library / js / DBUtility.js

diff --git a/src/vicar-config-qml/qml/vicarconfigqml/Library/js/DBUtility.js b/src/vicar-config-qml/qml/vicarconfigqml/Library/js/DBUtility.js
index df5c276..f5b1fe3 100644 (file)
--- a/src/vicar-config-qml/qml/vicarconfigqml/Library/js/DBUtility.js
+++ b/src/vicar-config-qml/qml/vicarconfigqml/Library/js/DBUtility.js
@@ -26,11 +26,7 @@ function initialize() {
             // Create the settings table if it doesn't already exist
             // If the table exists, this is skipped
             tx.executeSql('CREATE TABLE IF NOT EXISTS settings(setting TEXT PRIMARY KEY, value TEXT)');
-<<<<<<< HEAD
             tx.executeSql('CREATE TABLE IF NOT EXISTS profiles(id INTEGER PRIMARY KEY, numberpattern TEXT, gatewaynumber TEXT, dtmfformat TEXT, dtmfprefix TEXT, dtmfsuffix TEXT)');
-=======
-            tx.executeSql('CREATE TABLE IF NOT EXISTS rules(id INTEGER PRIMARY KEY, numberpattern TEXT, gatewaynumber TEXT, dtmfformat TEXT, dtmfprefix TEXT, dtmfsuffix TEXT)');
->>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
           },
         function(error) {
             logMessage("Error ["+error.code +"] - " + error.DOMString+" occurred.");
@@ -79,21 +75,13 @@ function setSetting(setting, value) {
 }
 
 function addRule(ruleObj){
-<<<<<<< HEAD
     logMessage('SQL> INSERT INTO profiles(id, numberpattern, gatewaynumber, dtmfformat, dtmfprefix, dtmfsuffix) VALUES (NULL, '+[ruleObj.numberpattern, ruleObj.gatewaynumber, ruleObj.dtmfformat, ruleObj.dtmfprefix, ruleObj.dtmfsuffix]+')');
-=======
-    logMessage('SQL> INSERT INTO rules(id, numberpattern, gatewaynumber, dtmfformat, dtmfprefix, dtmfsuffix) VALUES (NULL, '+[ruleObj.numberpattern, ruleObj.gatewaynumber, ruleObj.dtmfformat, ruleObj.dtmfprefix, ruleObj.dtmfsuffix]+')');
->>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
     var db = getDatabase();
     var res = "";
     logMessage("Opened VICaR database..");
 
     db.transaction(function(tx) {
-<<<<<<< HEAD
                var rs = tx.executeSql('INSERT INTO profiles(id, numberpattern, gatewaynumber, dtmfformat, dtmfprefix, dtmfsuffix) VALUES (NULL, ?, ?, ?, ?, ?);', [ruleObj.numberpattern, ruleObj.gatewaynumber, ruleObj.dtmfformat, ruleObj.dtmfprefix, ruleObj.dtmfsuffix]);
-=======
-               var rs = tx.executeSql('INSERT INTO rules(id, numberpattern, gatewaynumber, dtmfformat, dtmfprefix, dtmfsuffix) VALUES (NULL, ?, ?, ?, ?, ?);', [ruleObj.numberpattern, ruleObj.gatewaynumber, ruleObj.dtmfformat, ruleObj.dtmfprefix, ruleObj.dtmfsuffix]);
->>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
                logMessage("Inserted "+rs.rowsAffected+" rows");
                if (rs.rowsAffected > 0) {
                  res = "OK";
@@ -109,11 +97,7 @@ function addRule(ruleObj){
 }
 
 function updateRule(id,ruleObj){
-<<<<<<< HEAD
     logMessage('SQL> UPDATE profiles set numberpattern = '+[ruleObj.numberpattern]+
-=======
-    logMessage('SQL> UPDATE rules set numberpattern = '+[ruleObj.numberpattern]+
->>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
                ', gatewaynumber = '+[ruleObj.gatewaynumber]+
                ', dtmfformat = '+[ruleObj.dtmfformat]+
                ', dtmfprefix = '+[ruleObj.dtmfprefix]+
@@ -122,11 +106,7 @@ function updateRule(id,ruleObj){
     var db = getDatabase();
     var res = "";
     db.transaction(function(tx) {
-<<<<<<< HEAD
            var rs = tx.executeSql('UPDATE profiles set numberpattern = ?, gatewaynumber = ?, dtmfformat = ?, dtmfprefix = ?, dtmfsuffix = ? WHERE id = ?;',
-=======
-           var rs = tx.executeSql('UPDATE rules set numberpattern = ?, gatewaynumber = ?, dtmfformat = ?, dtmfprefix = ?, dtmfsuffix = ? WHERE id = ?;',
->>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
                             [ruleObj.numberpattern, ruleObj.gatewaynumber, ruleObj.dtmfformat, ruleObj.dtmfprefix, ruleObj.dtmfsuffix, id]);
            logMessage("Updated "+rs.rowsAffected+" rows");
            if (rs.rowsAffected > 0) {
@@ -143,19 +123,11 @@ function updateRule(id,ruleObj){
 }
 
 function removeRule(id){
-<<<<<<< HEAD
     logMessage('SQL> DELETE FROM profiles WHERE id = '+[id]);
     var db = getDatabase();
     var res = "";
     db.transaction(function(tx) {
          var rs = tx.executeSql('DELETE FROM profiles WHERE id = ?;', [id]);
-=======
-    logMessage('SQL> DELETE FROM rules WHERE id = '+[id]);
-    var db = getDatabase();
-    var res = "";
-    db.transaction(function(tx) {
-         var rs = tx.executeSql('DELETE FROM rules WHERE id = ?;', [id]);
->>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
                logMessage("Deleted "+rs.rowsAffected+" rows");
                if (rs.rowsAffected > 0) {
                  res = "OK";
@@ -175,11 +147,7 @@ function getAllRules(){
     var rulesArray = new Array();
     var ruleObj;
     db.transaction(function(tx) {
-<<<<<<< HEAD
            var rs = tx.executeSql('SELECT * FROM profiles');
-=======
-           var rs = tx.executeSql('SELECT * FROM rules');
->>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
            logMessage("Fetched "+rs.rows.length+" rows");
            var i = 0;
            for (i = 0; i < rs.rows.length; i++){
@@ -211,13 +179,8 @@ function getRuleByID(id){
     var db = getDatabase();
     var ruleObj;
     db.transaction(function(tx) {
-<<<<<<< HEAD
            logMessage('SQL> SELECT * FROM profiles WHERE id = '+[id]);
            var rs = tx.executeSql('SELECT * FROM profiles WHERE id = '+[id]);
-=======
-           logMessage('SQL> SELECT * FROM rules WHERE id = '+[id]);
-           var rs = tx.executeSql('SELECT * FROM rules WHERE id = '+[id]);
->>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
            logMessage("Fetched "+rs.rows.length+" rows");
            if (rs.rows.length > 0){
                ruleObj = new Object();