refactored smart section code

core/api/request/init.go

@@ -45,85 +45,6 @@ func (dr *databaseRequest) MakeTx() (err error) {
 	return err
 }
 
-// func init() {
-// 	var err error
-
-// 	env.GetString(&connectionString, "db", true,
-// 		`'username:password@protocol(hostname:port)/databasename" for example "fred:bloggs@tcp(localhost:3306)/documize"`,
-// 		func(*string, string) bool {
-
-// 			Db, err = sqlx.Open("mysql", stdConn(connectionString))
-
-// 			if err != nil {
-// 				log.Error("Unable to setup database", err)
-// 			}
-
-// 			Db.SetMaxIdleConns(30)
-// 			Db.SetMaxOpenConns(100)
-// 			Db.SetConnMaxLifetime(time.Second * 14400)
-
-// 			err = Db.Ping()
-
-// 			if err != nil {
-// 				log.Error("Unable to connect to database, connection string should be of the form: '"+
-// 					"username:password@tcp(host:3306)/database'", err)
-// 				os.Exit(2)
-// 			}
-
-// 			// go into setup mode if required
-// 			if web.SiteMode != web.SiteModeOffline {
-// 				if database.Check(Db, connectionString) {
-// 					if err := database.Migrate(true /* the config table exists */); err != nil {
-// 						log.Error("Unable to run database migration: ", err)
-// 						os.Exit(2)
-// 					}
-// 				} else {
-// 					log.Info("database.Check(Db) !OK, going into setup mode")
-// 				}
-// 			}
-
-// 			return false // value not changed
-// 		})
-// }
-
-// var stdParams = map[string]string{
-// 	"charset":          "utf8",
-// 	"parseTime":        "True",
-// 	"maxAllowedPacket": "4194304", // 4194304 // 16777216 = 16MB
-// }
-
-// func stdConn(cs string) string {
-// 	queryBits := strings.Split(cs, "?")
-// 	ret := queryBits[0] + "?"
-// 	retFirst := true
-// 	if len(queryBits) == 2 {
-// 		paramBits := strings.Split(queryBits[1], "&")
-// 		for _, pb := range paramBits {
-// 			found := false
-// 			if assignBits := strings.Split(pb, "="); len(assignBits) == 2 {
-// 				_, found = stdParams[strings.TrimSpace(assignBits[0])]
-// 			}
-// 			if !found { // if we can't work out what it is, put it through
-// 				if retFirst {
-// 					retFirst = false
-// 				} else {
-// 					ret += "&"
-// 				}
-// 				ret += pb
-// 			}
-// 		}
-// 	}
-// 	for k, v := range stdParams {
-// 		if retFirst {
-// 			retFirst = false
-// 		} else {
-// 			ret += "&"
-// 		}
-// 		ret += k + "=" + v
-// 	}
-// 	return ret
-// }
-
 type baseManager struct {
 }