major refactoring of base structure

1 files changed, 13 insertions, 12 deletions

diff --git a/src/helsinki.at/rhimport/importer.go b/src/helsinki.at/rhimport/importer.go
index e47bc05..95e3e73 100644
--- a/src/helsinki.at/rhimport/importer.go
+++ b/src/helsinki.at/rhimport/importer.go
@@ -25,12 +25,12 @@
 package rhimport
 
 import (
-	// "bytes"
-	// "fmt"
-	// "io"
-	// "mime/multipart"
-	// "net/http"
-	// "os"
+// "bytes"
+// "fmt"
+// "io"
+// "mime/multipart"
+// "net/http"
+// "os"
 )
 
 type ImportContext struct {
@@ -40,24 +40,27 @@ type ImportContext struct {
 	Trusted            bool
 	GroupName          string
 	Cart               int
+	Cut                int
 	Channels           int
 	NormalizationLevel int
 	AutotrimLevel      int
 	UseMetaData        bool
+	SourceUri          string
 	SourceFile         string
 	DeleteSourceFile   bool
 }
 
-func NewImportContext(conf *Config, user string, group string, cart int) *ImportContext {
+func NewImportContext(conf *Config, user string, group string) *ImportContext {
 	ctx := new(ImportContext)
 	ctx.Conf = conf
 	ctx.UserName = user
 	ctx.Password = ""
 	ctx.Trusted = false
 	ctx.GroupName = group
-	ctx.Cart = cart
+	ctx.Cart = 0
+	ctx.Cut = 0
 	ctx.Channels = 2
-	ctx.NormalizationLevel = 1200
+	ctx.NormalizationLevel = -1200
 	ctx.AutotrimLevel = 0
 	ctx.UseMetaData = false
 	ctx.SourceFile = ""
@@ -137,9 +140,7 @@ func ImportFile(ctx *ImportContext) (err error) {
 			return
 		}
 	}
-	rhdl.Printf("credentials: '%s':'%s'", ctx.UserName, ctx.Password)
-
-//	err = fmt.Errorf("%+v", ctx)
+	rhdl.Printf("%+v", ctx)
 
 	return
 }