Skip to content
Snippets Groups Projects
Verified Commit 3314b1fa authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Refactored API

parent 4555ef85
No related branches found
No related tags found
No related merge requests found
...@@ -2,15 +2,16 @@ package bahn ...@@ -2,15 +2,16 @@ package bahn
import ( import (
"encoding/json" "encoding/json"
"io"
"strconv" "strconv"
"strings" "strings"
"time" "time"
"unicode" "unicode"
) )
func CoachSequenceFromDecoder(source json.Decoder) (CoachSequence, error) { func CoachSequenceFromReader(source io.Reader) (CoachSequence, error) {
var raw rawCoachSequence var raw rawCoachSequence
if err := source.Decode(&raw); err != nil { if err := json.NewDecoder(source).Decode(&raw); err != nil {
return CoachSequence{}, err return CoachSequence{}, err
} }
return parseCoachSequence(raw), nil return parseCoachSequence(raw), nil
......
package bahn package bahn
import "encoding/xml" import (
"encoding/xml"
"io"
)
func StationsFromDecoder(source xml.Decoder) ([]Station, error) { func StationsFromReader(source io.Reader) ([]Station, error) {
var raw rawStations var raw rawStations
if err := source.Decode(&raw); err != nil { if err := xml.NewDecoder(source).Decode(&raw); err != nil {
return make([]Station, 0), err return make([]Station, 0), err
} }
return parseStations(raw), nil return parseStations(raw), nil
......
...@@ -3,11 +3,12 @@ package bahn ...@@ -3,11 +3,12 @@ package bahn
import ( import (
"encoding/xml" "encoding/xml"
"fmt" "fmt"
"io"
) )
func TimetableFromDecoder(source xml.Decoder) (Timetable, error) { func TimetableFromReader(source io.Reader) (Timetable, error) {
var raw rawTimetable var raw rawTimetable
if err := source.Decode(&raw); err != nil { if err := xml.NewDecoder(source).Decode(&raw); err != nil {
return Timetable{}, err return Timetable{}, err
} }
return parseTimetable(raw), nil return parseTimetable(raw), nil
......
package bahn package bahn
import "encoding/xml" import (
"encoding/xml"
"io"
)
func WingDefinitionFromDecoder(source xml.Decoder) (WingDefinition, error) { func WingDefinitionFromReader(source io.Reader) (WingDefinition, error) {
var raw rawWingDefinition var raw rawWingDefinition
if err := source.Decode(&raw); err != nil { if err := xml.NewDecoder(source).Decode(&raw); err != nil {
return WingDefinition{}, err return WingDefinition{}, err
} }
return parseWingDefinition(raw), nil return parseWingDefinition(raw), nil
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment