Mal wieder Jans Suppe ausgeloeffelt

1 files changed, 7 insertions, 8 deletions

diff --git a/tools/importer/ACDv2Reader.go b/tools/importer/ACDv2Reader.go
index 4dab3c0..f34dd15 100644
--- a/tools/importer/ACDv2Reader.go
+++ b/tools/importer/ACDv2Reader.go
@@ -6,8 +6,7 @@ import (
         "path/filepath"
         "strings"
 
-        "fagott.pw/grilist/modules/grils"
-        "fagott.pw/grilist/modules/series"
+        "fagott.pw/grilist/models"
 )
 
 const failMsg = "Offenbar war meine Annahme bzgl. der Traits nicht ganz korrekt"
@@ -45,7 +44,7 @@ type ACDv2Gril struct {
 
 func (r *ACDv2Reader) Read(path string) WrappedGril {
         g := WrappedGril{}
-        g.Gril = grils.Gril{}
+        g.Gril = models.Gril{}
         data, err := ioutil.ReadFile(path)
         ifErrExit(err)
         var jObj ACDv2Gril
@@ -61,7 +60,7 @@ func (r *ACDv2Reader) Read(path string) WrappedGril {
         for _, v := range jObj.Tags {
                 g.Gril.Tags = append(g.Gril.Tags, v.Name)
         }
-        g.Gril.Traits = make([]grils.Trait, 0)
+        g.Gril.Traits = make([]models.Trait, 0)
         if len(jObj.Traits.Official) != len(jObj.Traits.Indexed) {
                 panic(failMsg)
         }
@@ -69,16 +68,16 @@ func (r *ACDv2Reader) Read(path string) WrappedGril {
                 if jObj.Traits.Official[i].Name != jObj.Traits.Indexed[i].Name {
                         panic(failMsg)
                 }
-                t := grils.Trait{
+                t := models.Trait{
                         Name:          jObj.Traits.Official[i].Name,
                         Value:         jObj.Traits.Indexed[i].Value,
                         OfficialValue: jObj.Traits.Official[i].Value,
                 }
                 g.Gril.Traits = append(g.Gril.Traits, t)
         }
-        g.Gril.Series = make([]series.Series, 0)
+        g.Gril.Series = make([]models.Series, 0)
         for _, v := range jObj.Assignments {
-                s := series.Series{
+                s := models.Series{
                         ID: v,
                 }
                 g.Gril.Series = append(g.Gril.Series, s)
@@ -87,5 +86,5 @@ func (r *ACDv2Reader) Read(path string) WrappedGril {
 }
 
 func (r *ACDv2Reader) ID() int {
-        return int(grils.DataSourceACD)
+        return int(models.DataSourceACD)
 }