Merge pull request #1 from v8platform/fix

вернул типы к первоначальному виду
v8platform · Apr 28, 2021 · 6492e2d · 6492e2d
2 parents 218745c + f30609d
commit 6492e2d
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 45 deletions.
diff --git a/classes/catalog.go → catalog.go b/classes/catalog.go → catalog.go
@@ -1,4 +1,4 @@
-package classes
+package mdclasses
 
 import "encoding/xml"
 

diff --git a/configuration.go b/configuration.go
@@ -3,7 +3,6 @@ package mdclasses
 import (
 	"encoding/xml"
 	"github.com/khorevaa/logos"
-	"github.com/v8platform/mdclasses/classes"
 )
 
 var log = logos.New("github.com/v8platform/mdclasses").Sugar()
@@ -83,46 +82,44 @@ type Configuration struct {
 	Subsystems      []Subsystem `xml:"-"`
 	SubsystemsNames []string    `xml:"subsystems"`
 
-	StyleItems                  []string          `xml:"styleItems"`
-	CommonPictures              []string          `xml:"commonPictures"`
-	SessionParameters           []string          `xml:"sessionParameters"`
-	Roles                       []string          `xml:"roles"`
-	CommonTemplates             []string          `xml:"commonTemplates"`
-	FilterCriteria              []string          `xml:"filterCriteria"`
-	CommonModules               []string          `xml:"commonModules"`
-	CommonAttributes            []string          `xml:"commonAttributes"`
-	ExchangePlans               []string          `xml:"exchangePlans"`
-	XDTOPackages                []string          `xml:"xDTOPackages"`
-	WebServices                 []string          `xml:"webServices"`
-	HttpServices                []string          `xml:"httpServices"`
-	WsReferences                []string          `xml:"wsReferences"`
-	EventSubscriptions          []string          `xml:"eventSubscriptions"`
-	ScheduledJobs               []string          `xml:"scheduledJobs"`
-	SettingsStorages            []string          `xml:"settingsStorages"`
-	FunctionalOptions           []string          `xml:"functionalOptions"`
-	FunctionalOptionsParameters []string          `xml:"functionalOptionsParameters"`
-	DefinedTypes                []string          `xml:"definedTypes"`
-	CommonCommands              []string          `xml:"commonCommands"`
-	CommandGroups               []string          `xml:"commandGroups"`
-	Constants                   []string          `xml:"constants"`
-	CommonForms                 []string          `xml:"commonForms"`
-	CatalogsNames               []string          `xml:"catalogs"`
-	Catalogs                    []classes.Catalog `xml:"-"`
-	Documents                   []string          `xml:"documents"`
-	DocumentNumerators          []string          `xml:"documentNumerators"`
-	DocumentJournals            []string          `xml:"documentJournals"`
-	Enums                       []string          `xml:"enums"`
-	Reports                     []string          `xml:"reports"`
-	DataProcessors              []string          `xml:"dataProcessors"`
-	InformationRegisters        []string          `xml:"informationRegisters"`
-	AccumulationRegisters       []string          `xml:"accumulationRegisters"`
-	ChartsOfCharacteristicTypes []string          `xml:"chartsOfCharacteristicTypes"`
-	BusinessProcesses           []string          `xml:"businessProcesses"`
-	Tasks                       []string          `xml:"tasks"`
+	StyleItems                  []string  `xml:"styleItems"`
+	CommonPictures              []string  `xml:"commonPictures"`
+	SessionParameters           []string  `xml:"sessionParameters"`
+	Roles                       []string  `xml:"roles"`
+	CommonTemplates             []string  `xml:"commonTemplates"`
+	FilterCriteria              []string  `xml:"filterCriteria"`
+	CommonModules               []string  `xml:"commonModules"`
+	CommonAttributes            []string  `xml:"commonAttributes"`
+	ExchangePlans               []string  `xml:"exchangePlans"`
+	XDTOPackages                []string  `xml:"xDTOPackages"`
+	WebServices                 []string  `xml:"webServices"`
+	HttpServices                []string  `xml:"httpServices"`
+	WsReferences                []string  `xml:"wsReferences"`
+	EventSubscriptions          []string  `xml:"eventSubscriptions"`
+	ScheduledJobs               []string  `xml:"scheduledJobs"`
+	SettingsStorages            []string  `xml:"settingsStorages"`
+	FunctionalOptions           []string  `xml:"functionalOptions"`
+	FunctionalOptionsParameters []string  `xml:"functionalOptionsParameters"`
+	DefinedTypes                []string  `xml:"definedTypes"`
+	CommonCommands              []string  `xml:"commonCommands"`
+	CommandGroups               []string  `xml:"commandGroups"`
+	Constants                   []string  `xml:"constants"`
+	CommonForms                 []string  `xml:"commonForms"`
+	CatalogsNames               []string  `xml:"catalogs"`
+	Catalogs                    []Catalog `xml:"-"`
+	Documents                   []string  `xml:"documents"`
+	DocumentNumerators          []string  `xml:"documentNumerators"`
+	DocumentJournals            []string  `xml:"documentJournals"`
+	Enums                       []string  `xml:"enums"`
+	Reports                     []string  `xml:"reports"`
+	DataProcessors              []string  `xml:"dataProcessors"`
+	InformationRegisters        []string  `xml:"informationRegisters"`
+	AccumulationRegisters       []string  `xml:"accumulationRegisters"`
+	ChartsOfCharacteristicTypes []string  `xml:"chartsOfCharacteristicTypes"`
+	BusinessProcesses           []string  `xml:"businessProcesses"`
+	Tasks                       []string  `xml:"tasks"`
 }
 
-const ConfigurationFile = "Configuration.mdo"
-
 func (conf *Configuration) Unpack(cfg UnpackConfig) error {
 
 	for _, name := range conf.SubsystemsNames {
@@ -138,7 +135,7 @@ func (conf *Configuration) Unpack(cfg UnpackConfig) error {
 
 	for _, name := range conf.CatalogsNames {
 
-		value := classes.Catalog{}
+		value := Catalog{}
 		err := Unpack(cfg.WithName(name, "Catalog"), &value)
 		if err != nil {
 			return err

diff --git a/classes/document.go → document.go b/classes/document.go → document.go
@@ -1,4 +1,4 @@
-package classes
+package mdclasses
 
 type Document struct {
 }
diff --git a/subsystem.go b/subsystem.go
@@ -2,7 +2,6 @@ package mdclasses
 
 import (
 	"encoding/xml"
-	"github.com/v8platform/mdclasses/classes"
 	"strings"
 )
 
@@ -68,9 +67,9 @@ func objectByType(contentType string) interface{} {
 	case "businessprocess":
 		return nil
 	case "catalog":
-		return &classes.Catalog{}
+		return &Catalog{}
 	case "document":
-		return &classes.Document{}
+		return &Document{}
 	default:
 		log.Warnf("Unknown content type: %s", contentType)
 	}