From 962005ad28742e084d1df5b9c0f1bc882e98d947 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon@itsyscom.com>
Date: Tue, 2 Oct 2018 13:24:42 +0300
Subject: [PATCH] Console command accepts empty slices

---
 apier/v1/filter_indexes.go  | 14 +++++++-------
 console/command_executer.go |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apier/v1/filter_indexes.go b/apier/v1/filter_indexes.go
index 020e3cbf9..f1f690764 100644
--- a/apier/v1/filter_indexes.go
+++ b/apier/v1/filter_indexes.go
@@ -263,7 +263,7 @@ func (self *ApierV1) ComputeFilterIndexes(args utils.ArgsComputeFilterIndexes, r
 	}
 	//ChargerProfile Indexes
 	if cppIndexes != nil {
-		if err := attrIndexes.StoreIndexes(true, transactionID); err != nil {
+		if err := cppIndexes.StoreIndexes(true, transactionID); err != nil {
 			for _, id := range *args.ChargerIDs {
 				cpp, err := self.DataManager.GetChargerProfile(args.Tenant, id, true, false, utils.NonTransactional)
 				if err != nil {
@@ -315,7 +315,7 @@ func (self *ApierV1) computeThresholdIndexes(tenant string, thIDs *[]string,
 					Tenant: th.Tenant,
 					ID:     th.ID,
 					Rules: []*engine.FilterRule{
-						&engine.FilterRule{
+						{
 							Type:      utils.MetaDefault,
 							FieldName: utils.META_ANY,
 							Values:    []string{utils.META_ANY},
@@ -383,7 +383,7 @@ func (self *ApierV1) computeAttributeIndexes(tenant, context string, attrIDs *[]
 					Tenant: ap.Tenant,
 					ID:     ap.ID,
 					Rules: []*engine.FilterRule{
-						&engine.FilterRule{
+						{
 							Type:      utils.MetaDefault,
 							FieldName: utils.META_ANY,
 							Values:    []string{utils.META_ANY},
@@ -450,7 +450,7 @@ func (self *ApierV1) computeResourceIndexes(tenant string, rsIDs *[]string,
 					Tenant: rp.Tenant,
 					ID:     rp.ID,
 					Rules: []*engine.FilterRule{
-						&engine.FilterRule{
+						{
 							Type:      utils.MetaDefault,
 							FieldName: utils.META_ANY,
 							Values:    []string{utils.META_ANY},
@@ -517,7 +517,7 @@ func (self *ApierV1) computeStatIndexes(tenant string, stIDs *[]string,
 					Tenant: sqp.Tenant,
 					ID:     sqp.ID,
 					Rules: []*engine.FilterRule{
-						&engine.FilterRule{
+						{
 							Type:      utils.MetaDefault,
 							FieldName: utils.META_ANY,
 							Values:    []string{utils.META_ANY},
@@ -584,7 +584,7 @@ func (self *ApierV1) computeSupplierIndexes(tenant string, sppIDs *[]string,
 					Tenant: spp.Tenant,
 					ID:     spp.ID,
 					Rules: []*engine.FilterRule{
-						&engine.FilterRule{
+						{
 							Type:      utils.MetaDefault,
 							FieldName: utils.META_ANY,
 							Values:    []string{utils.META_ANY},
@@ -651,7 +651,7 @@ func (self *ApierV1) computeChargerIndexes(tenant string, cppIDs *[]string,
 					Tenant: cpp.Tenant,
 					ID:     cpp.ID,
 					Rules: []*engine.FilterRule{
-						&engine.FilterRule{
+						{
 							Type:      utils.META_NONE,
 							FieldName: utils.META_ANY,
 							Values:    []string{utils.META_ANY},
diff --git a/console/command_executer.go b/console/command_executer.go
index 7d284af83..85c77039f 100644
--- a/console/command_executer.go
+++ b/console/command_executer.go
@@ -31,7 +31,7 @@ import (
 )
 
 var (
-	lineR = regexp.MustCompile(`(\w+)\s*=\s*(\[.+?\]|\".+?\"|\{.+?\}|.+?)(?:\s+|$)`)
+	lineR = regexp.MustCompile(`(\w+)\s*=\s*(\[.*?\]|\".*?\"|\{.*?\}|.+?)(?:\s+|$)`)
 	jsonR = regexp.MustCompile(`"(\w+)":(\[.+?\]|.+?)[,|}]`)
 )