jakoubek/feragstring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Integration of Route into feragstring and production drop

Browse source
This commit is contained in:
Oliver Jakoubek 2020-06-25 22:14:41 +02:00
commit 5387d9b9ae
3 changed files with 189 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

50
ferag.go
View file

@ -11,6 +11,8 @@ type FeragString struct {
TitleEnd *TitleEnd
ProductReferences []*ProductReference
ProductReferencesNr int
Routes []*Route
RouteCount int
RouteListEntries []*RouteListEntry
RouteListEntryCount int
RouteInfoEntries []*RouteInfo
@ -40,21 +42,32 @@ func (fs *FeragString) PrintOut() string {
info += pr.Message()
}
for _, rl := range fs.RouteListEntries {
info += rl.Message()
// create route list entries for every route
for _, rt := range fs.Routes {
info += rt.GetRouteListEntry().Message()
}
for _, ri := range fs.RouteInfoEntries {
info += ri.Message()
// create route info for every route
// including embedded production drops
for _, rt := range fs.Routes {
info += rt.GetRouteMessage()
}
for _, pd := range fs.ProductionDropEntries {
info += pd.Message()
}
for _, re := range fs.RouteEndEntries {
info += re.Message()
}
//for _, rl := range fs.RouteListEntries {
// info += rl.Message()
//}
//
//for _, ri := range fs.RouteInfoEntries {
// info += ri.Message()
//}
//
//for _, pd := range fs.ProductionDropEntries {
// info += pd.Message()
//}
//
//for _, re := range fs.RouteEndEntries {
// info += re.Message()
//}
// +2441 | last message is the corresponding title end
info += fs.TitleEnd.Message()
@ -71,6 +84,17 @@ func (fs *FeragString) AddProductReference(pr *ProductReference) error {
return nil
}
func (fs *FeragString) AddRoute(r *Route) error {
fs.RouteCount++
fs.Routes = append(fs.Routes, r)
return nil
}
func (fs *FeragString) NextRouteCode() int {
return fs.RouteCount + 1
//return fs.RouteListEntryCount + 1
}
func (fs *FeragString) AddRouteListEntry(rl *RouteListEntry) error {
fs.RouteListEntryCount++
//if rl.routeCode == 0 {
@ -80,10 +104,6 @@ func (fs *FeragString) AddRouteListEntry(rl *RouteListEntry) error {
return nil
}
func (fs *FeragString) NextRouteCode() int {
return fs.RouteListEntryCount + 1
}
func (fs *FeragString) AddRouteInfo(ri *RouteInfo) error {
fs.RouteInfoEntries = append(fs.RouteInfoEntries, ri)
return nil