export api db vars/types

Author: ubaldus

api/db.go

@@ -6,8 +6,8 @@ import (
 	"github.com/eja/tibula/db"
 )
 
-type dbTypeLink = db.TypeLink
-type dbTypeModule = db.TypeModule
-type dbTypeSession = db.TypeSession
+type TypeDbLink = db.TypeLink
+type TypeDbModule = db.TypeModule
+type TypeDbSession = db.TypeSession
 
-var dbSession = db.Session
+var DbSession = db.Session

api/main.go

@@ -16,14 +16,14 @@ func Set() TypeApi {
 		DefaultSearchOrder: "ejaLog DESC",
 		Values:             make(map[string]string),
 		SearchOrder:        make(map[string]string),
-		Link:               dbTypeLink{},
+		Link:               TypeDbLink{},
 	}
 }
 
 func Run(eja TypeApi, sessionSave bool) (result TypeApi, err error) {
 	var user map[string]string
 
-	db := dbSession()
+	db := DbSession()
 
 	//open db connection
 	if err = db.Open(sys.Options.DbType, sys.Options.DbName, sys.Options.DbUser, sys.Options.DbPass, sys.Options.DbHost, sys.Options.DbPort); err != nil {
@@ -121,7 +121,7 @@ func Run(eja TypeApi, sessionSave bool) (result TypeApi, err error) {
 				if eja.ModuleId == eja.Link.ModuleId && eja.Id == eja.Link.FieldId && eja.Id > 0 {
 					db.SessionCleanLink(eja.Owner)
 					db.SessionCleanSearch(eja.Owner)
-					eja.Link = dbTypeLink{}
+					eja.Link = TypeDbLink{}
 					eja.Action = "edit"
 					eja.Linking = false
 				}

api/plugins.go

@@ -6,10 +6,10 @@ import (
 	"encoding/json"
 )
 
-type TypePlugins map[string]func(TypeApi, dbTypeSession) TypeApi
+type TypePlugins map[string]func(TypeApi, TypeDbSession) TypeApi
 
 var Plugins = TypePlugins{
-	"ejaProfile": func(eja TypeApi, db dbTypeSession) TypeApi {
+	"ejaProfile": func(eja TypeApi, db TypeDbSession) TypeApi {
 		eja.Alert = nil
 		if eja.Action == "run" {
 			if eja.Values["passwordOld"] == "" || eja.Values["passwordNew"] == "" || eja.Values["passwordRepeat"] == "" {
@@ -31,13 +31,13 @@ var Plugins = TypePlugins{
 		}
 		return eja
 	},
-	"ejaImport": func(eja TypeApi, db dbTypeSession) TypeApi {
+	"ejaImport": func(eja TypeApi, db TypeDbSession) TypeApi {
 		if eja.Action == "run" {
 			moduleName := eja.Values["moduleName"]
 			moduleData := eja.Values["import"]
 			dataImport := db.Number(eja.Values["dataImport"])
 			if moduleData != "" {
-				var module dbTypeModule
+				var module TypeDbModule
 				if err := json.Unmarshal([]byte(moduleData), &module); err != nil {
 					alert(&eja.Alert, db.Translate("ejaImportJsonError", eja.Owner))
 				} else {
@@ -61,7 +61,7 @@ var Plugins = TypePlugins{
 		}
 		return eja
 	},
-	"ejaExport": func(eja TypeApi, db dbTypeSession) TypeApi {
+	"ejaExport": func(eja TypeApi, db TypeDbSession) TypeApi {
 		if eja.Action == "run" {
 			moduleId := db.Number(eja.Values["ejaModuleId"])
 			dataExport := db.Number(eja.Values["dataExport"]) > 0