new features for 1.1

src/action/generator.go

@@ -15,23 +15,23 @@ import (
 	"strings"
 )
 
-func Generate(deflt string, yml string, total int, fieldsToExportStr string, out string, format string, table string) {
+func Generate(defaultFile string, configFile string, total int, fieldsToExportStr string, out string, format string, table string) {
 	//startTime := time.Now().Unix()
 
-	if deflt != "" && yml == "" {
-		yml = deflt
-		deflt = ""
+	if defaultFile != "" && configFile == "" {
+		configFile = defaultFile
+		defaultFile = ""
 	}
 
 	fieldsToExport := make([]string, 0)
 	if fieldsToExportStr != "" {
 		fieldsToExport = strings.Split(fieldsToExportStr, ",")
 	}
-	abs, _ := filepath.Abs(filepath.Dir(yml))
+	abs, _ := filepath.Abs(filepath.Dir(configFile))
 	vari.InputDir = abs + string(os.PathSeparator)
 	constant.Total = total
 
-	rows, colTypes := gen.GenerateForDefinition(deflt, yml, &fieldsToExport, total)
+	rows, colTypes := gen.GenerateForDefinition(defaultFile, configFile, &fieldsToExport, total)
 	var content string
 	content, vari.JsonResp = Print(rows, format, table, colTypes, fieldsToExport)
 

src/gen/generator.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 )
 
-func GenerateForDefinition(deflt, yml string, fieldsToExport *[]string, total int) ([][]string, []bool) {
-	constant.Def = LoadRootDef(deflt, yml, fieldsToExport)
+func GenerateForDefinition(defaultFile, configFile string, fieldsToExport *[]string, total int) ([][]string, []bool) {
+	constant.Def = LoadRootDef(defaultFile, configFile, fieldsToExport)
 	constant.Res = LoadResDef(*fieldsToExport)
 
 	fieldNameToValues := map[string][]string{}

src/service/request.go

@@ -34,11 +34,11 @@ func ParseRequestParams(req *http.Request) (root, defaultFile, yamlFile string,
 	configDefContent := req.FormValue("config")
 
 	if defaultDefContent != "" {
-		defaultFile = vari.WorkDir + "___default.yaml"
+		defaultFile = vari.WorkDir + "._default.yaml"
 		fileUtils.WriteFile(defaultFile, defaultDefContent)
 	}
 	if configDefContent != "" {
-		yamlFile = vari.WorkDir + "___config.yaml"
+		yamlFile = vari.WorkDir + "._config.yaml"
 		fileUtils.WriteFile(yamlFile, configDefContent)
 	}
 

src/zd.go

@@ -26,7 +26,7 @@ import (
 
 var (
 	defaultFile string
-	yamlFile    string
+	configFile  string
 	count       int
 	fields      string
 
@@ -59,8 +59,8 @@ func main() {
 	flagSet.StringVar(&defaultFile, "d", "", "")
 	flagSet.StringVar(&defaultFile, "default", "", "")
 
-	flagSet.StringVar(&yamlFile, "c", "", "")
-	flagSet.StringVar(&yamlFile, "config", "", "")
+	flagSet.StringVar(&configFile, "c", "", "")
+	flagSet.StringVar(&configFile, "config", "", "")
 
 	flagSet.StringVar(&input, "i", "", "")
 	flagSet.StringVar(&input, "input", "", "")
@@ -157,9 +157,9 @@ func toGen() {
 			}
 		}
 
-		action.Generate(defaultFile, yamlFile, count, fields, output, format, table)
+		action.Generate(defaultFile, configFile, count, fields, output, format, table)
 	} else if vari.RunMode == constant.RunModeServerRequest {
-		action.Generate(defaultFile, yamlFile, count, fields, output, format, table)
+		action.Generate(defaultFile, configFile, count, fields, output, format, table)
 	}
 }
 
@@ -180,7 +180,7 @@ func StartServer() {
 }
 
 func DataHandler(w http.ResponseWriter, req *http.Request) {
-	root, defaultFile, yamlFile, count, fields,
+	root, defaultFile, configFile, count, fields,
 		vari.HeadSep, vari.Length, vari.LeftPad, vari.RightPad,
 		format, table = service.ParseRequestParams(req)