Skip to content

Maps are not guaranteed to maintain order #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
viocle-kvanek wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Maps are not guaranteed to maintain order #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
37a8958
Update SpssWriter.variables from a map to a slice. Maps are not guara…
viocle-kvanek Apr 8, 2021
503ef13
Add NewSpssInMemoryWriter which allows passing a WriterSeeker for in …
viocle-kvanek Apr 8, 2021
0728363
Update go.mod
viocle-kvanek Apr 8, 2021
1d70188
Remove unused WriterSeeker from go.sum
viocle-kvanek Apr 8, 2021
c722549
del mod
viocle-kvanek Apr 8, 2021
5a32c85
Add ShortName field to Variable type to alternatively use a predefine…
viocle-kvanek Apr 19, 2021
7d2f4a5
Change short name generation. Make sure to set pre-defined short name…
viocle-kvanek Apr 19, 2021
bca8dbe
Use name instead of short name when writing long string value labels.
viocle-kvanek Apr 19, 2021
f022edd
Return the actual width of the variable in segmentWidth instead of th…
viocle-kvanek Aug 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions go.mod
View file
Open in desktop

This file was deleted.

28 changes: 21 additions & 7 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,14 @@ type Label struct {

// Variable defines the configuration for adding variables to the SPSS configuration
type Variable struct {
Name string
Type SpssType
Measure SpssMeasure
Decimal int8
Width int16
Label string
Labels []Label
Name string
ShortName string
Type SpssType
Measure SpssMeasure
Decimal int8
Width int16
Label string
Labels []Label
}

type variable struct {
Expand Down Expand Up @@ -89,6 +90,15 @@ func (v *Variable) getMeasure() int8 {
}
}

// checkAndGetShortName returns the specified shortName otherwise generates one
func (v *Variable) checkAndGetShortName(s *SpssWriter, shortName string) string {
if shortName == "" {
return v.getShortName(s)
}
s.names[shortName] = v.Name
return shortName
}

// Create a short name and make sure there are no duplicates
func (v *Variable) getShortName(s *SpssWriter) string {
short := strings.ToUpper(v.Name)
Expand Down Expand Up @@ -119,6 +129,10 @@ func (v *Variable) getShortName(s *SpssWriter) string {

func (v *variable) segmentWidth(index int) int32 {
if v.spssType == SpssTypeString {
if len(v.labels) <= 0 {
return int32(v.width)
}
// value labels cannot be larger than 40
return 40
}

Expand Down
100 changes: 65 additions & 35 deletions writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import (
"strconv"
"strings"
"time"

"github.com/fedom/writerseeker"
)

var endian = binary.LittleEndian
Expand All @@ -20,15 +22,16 @@ const TimeOffset = 12219379200

// SpssWriter defines the struct to write SPSS objects
type SpssWriter struct {
*bufio.Writer // Buffered writer
seeker io.WriteSeeker // Original writer
bytecode *bytecodeWriter // Special writer for compressed cases
names map[string]string // Mapping of names for easy access
count int // Count of values
index int32 // Writing index
endian binary.ByteOrder // Endian
variables map[string]variable // Written variables
valCount int // Number of value rows
*bufio.Writer // Buffered writer
seeker io.WriteSeeker // Original writer
bytecode *bytecodeWriter // Special writer for compressed cases
names map[string]string // Mapping of names for easy access
count int // Count of values
index int32 // Writing index
endian binary.ByteOrder // Endian
variables []variable // Written variables
valCount int // Number of value rows
productName string // name to place in header denoting the product generating this file
}

// NewSpssWriter - Returns an SPSS Writer struct given a file
Expand All @@ -38,14 +41,41 @@ func NewSpssWriter(file *os.File) (*SpssWriter, error) {
byteCode := newBytecodeWriter(writer, 100.0)

spssWriter := &SpssWriter{
seeker: file,
Writer: writer,
bytecode: byteCode,
names: make(map[string]string),
variables: make(map[string]variable),
index: 1,
endian: binary.LittleEndian,
count: 0,
seeker: file,
Writer: writer,
bytecode: byteCode,
names: make(map[string]string),
variables: make([]variable, 0, 1),
index: 1,
endian: binary.LittleEndian,
count: 0,
productName: "xml2sav 2.0",
}

spssWriter.headerRecord()

return spssWriter, nil
}

// NewSpssWriter - Returns an SPSS Writer struct using an in memory buffer
func NewSpssInMemoryWriter(f *writerseeker.WriterSeeker, productName string) (*SpssWriter, error) {
writer := bufio.NewWriter(f)

byteCode := newBytecodeWriter(writer, 100.0)

if productName == "" {
productName = "xml2sav 2.0"
}
spssWriter := &SpssWriter{
seeker: f,
Writer: writer,
bytecode: byteCode,
names: make(map[string]string),
variables: make([]variable, 0, 1),
index: 1,
endian: binary.LittleEndian,
count: 0,
productName: productName,
}

spssWriter.headerRecord()
Expand Down Expand Up @@ -194,18 +224,18 @@ func (s *SpssWriter) writeInfoRecords() {

func (s *SpssWriter) headerRecord() {
c := time.Now()
s.Write(stob("$FL2", 4)) // rec_tyoe
s.Write(stob("@(#) SPSS DATA FILE - xml2sav 2.0", 60)) // prod_name
binary.Write(s, endian, int32(2)) // layout_code
binary.Write(s, endian, s.caseSize()) // nominal_case_size
binary.Write(s, endian, int32(1)) // compression
binary.Write(s, endian, int32(0)) // weight_index
binary.Write(s, endian, int32(-1)) // ncases
binary.Write(s, endian, float64(100)) // bias
s.Write(stob(c.Format("02 Jan 06"), 9)) // creation_date
s.Write(stob(c.Format("15:04:05"), 8)) // creation_time
s.Write(stob("Generated SPSS", 64)) // file_label
s.Write(stob("\x00\x00\x00", 3)) // padding
s.Write(stob("$FL2", 4)) // rec_tyoe
s.Write(stob(fmt.Sprintf("@(#) SPSS DATA FILE - %s", s.productName), 60)) // prod_name
binary.Write(s, endian, int32(2)) // layout_code
binary.Write(s, endian, s.caseSize()) // nominal_case_size
binary.Write(s, endian, int32(1)) // compression
binary.Write(s, endian, int32(0)) // weight_index
binary.Write(s, endian, int32(-1)) // ncases
binary.Write(s, endian, float64(100)) // bias
s.Write(stob(c.Format("02 Jan 06"), 9)) // creation_date
s.Write(stob(c.Format("15:04:05"), 8)) // creation_time
s.Write(stob("Generated SPSS", 64)) // file_label
s.Write(stob("\x00\x00\x00", 3)) // padding
}

// AddVariable - Add variables to the SPSS file
Expand Down Expand Up @@ -260,7 +290,7 @@ func (s *SpssWriter) AddVariable(V *Variable) error {
v := variable{
index: s.index,
name: V.Name,
shortName: V.getShortName(s),
shortName: V.checkAndGetShortName(s, V.ShortName),
spssType: V.Type,
measure: V.getMeasure(),
decimal: V.Decimal,
Expand Down Expand Up @@ -326,7 +356,7 @@ func (s *SpssWriter) AddVariable(V *Variable) error {
}
}

s.variables[v.name] = v
s.variables = append(s.variables, v)
}

return nil
Expand Down Expand Up @@ -502,10 +532,10 @@ func (s *SpssWriter) longStringValueLabelsRecord() {
buf := new(bytes.Buffer)
for _, v := range s.variables {
if len(v.labels) > 0 && v.spssType == SpssTypeString {
binary.Write(buf, endian, int32(len(v.shortName))) // var_name_len
buf.Write([]byte(v.shortName)) // var_name
binary.Write(buf, endian, int32(v.width)) // var_width
binary.Write(buf, endian, int32(len(v.labels))) // n_labels
binary.Write(buf, endian, int32(len(v.name))) // var_name_len
buf.Write([]byte(v.name)) // var_name
binary.Write(buf, endian, int32(v.width)) // var_width
binary.Write(buf, endian, int32(len(v.labels))) // n_labels
for _, l := range v.labels {
binary.Write(buf, endian, int32(len(l.Value))) // value_len
buf.Write([]byte(l.Value)) // value
Expand Down