alsmanager_lib 2.0.59 → 2.0.61

package/lib/modules.js

@@ -156,12 +156,36 @@ function removeConnector(db_used, id_device, conn_obj) {
 //End Manage connectors
 // Manage Storage
 function queryStorageManifactures() {
-    var query = "SELECT DISTINCT storage_manifacturer as marca from device_storages order by storage_manifacturer";
+    var query = "SELECT DISTINCT upper(trim(storage_manifacturer)) as marca from device_storages order by storage_manifacturer";
     return query;
 }
 
-function queryStorageModels() {
-    var query = "SELECT DISTINCT storage_model as modello from device_storages order by storage_model";
+function queryStorageModelsSQLite(marca) {
+    var query = "SELECT DISTINCT upper(trim(storage_model)) as modello from device_storages ";
+    query += "where upper(trim(storage_manifacturer)) = '" + marca + "' ";
+    query += "order by storage_model";
+    return query;
+}
+
+function queryStorageModelsMySQL(marca) {
+    var query = "SELECT DISTINCT upper(trim(storage_model)) as modello from device_storages ";
+    query += "where upper(trim(storage_manifacturer)) = :marca ";
+    query += "order by storage_model";
+    return query;
+}
+
+function queryStorageModels(db_used, marca) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = queryStorageModelsSQLite(marca);
+                break;
+            case 'MYSQL':
+                query = queryStorageModelsMySQL(marca);
+                break;
+        }
+    }    
     return query;
 }
 

package/package.json

@@ -4,7 +4,7 @@
     ".": "./lib/modules.js",
     "./dbconn": "./lib/dbconn.js"
   },
-  "version": "2.0.59",
+  "version": "2.0.61",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",