MTSR/mapserver
4
0
Fork 1
Code Issues Pull Requests 1 Packages Projects Releases 1 Wiki Activity

working metadata parser

Browse Source
This commit is contained in:
NatureFreshMilk 2019-01-11 08:58:12 +01:00
parent 9abfa2fd83
commit 8eac64571a
4 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mapblockaccessor/logger.go Normal file
View File

@ -0,0 +1,10 @@
package mapblockaccessor
import (
"github.com/sirupsen/logrus"
)
var log *logrus.Entry
func init(){
log = logrus.WithFields(logrus.Fields{"prefix": "mapblockaccessor"})
}

2
mapblockaccessor/mapblockaccessor_test.go
View File

@ -7,6 +7,7 @@ import (
"mapserver/db" "mapserver/db"
"os" "os"
"testing" "testing"
"github.com/sirupsen/logrus"
) )
func copy(src, dst string) error { func copy(src, dst string) error {
@ -55,6 +56,7 @@ func GetTestDatabase() db.DBAccessor {
} }
func TestSimpleAccess(t *testing.T) { func TestSimpleAccess(t *testing.T) {
logrus.SetLevel(logrus.DebugLevel)
a := GetTestDatabase() a := GetTestDatabase()
cache := NewMapBlockAccessor(a) cache := NewMapBlockAccessor(a)
mb, err := cache.GetMapBlock(coords.NewMapBlockCoords(0, 0, 0)) mb, err := cache.GetMapBlock(coords.NewMapBlockCoords(0, 0, 0))

10
mapblockparser/logger.go Normal file
View File

@ -0,0 +1,10 @@
package mapblockparser
import (
"github.com/sirupsen/logrus"
)
var log *logrus.Entry
func init(){
log = logrus.WithFields(logrus.Fields{"prefix": "mapblockaccessor"})
}

8
mapblockparser/metadata.go
View File

@ -8,6 +8,7 @@ import (
"io" "io"
"strconv" "strconv"
"strings" "strings"
"github.com/sirupsen/logrus"
) )
const ( const (
@ -49,9 +50,16 @@ func parseMetadata(mapblock *MapBlock, data []byte) (int, error) {
metadata := buf.Bytes() metadata := buf.Bytes()
log.WithFields(logrus.Fields{"metadata-length": len(metadata)}).Debug("Parsing metadata")
offset := 0 offset := 0
version := metadata[offset] version := metadata[offset]
if version == 0 {
//No data?
return cr.Count, nil
}
if version != 2 { if version != 2 {
return 0, errors.New("Wrong metadata version: " + strconv.Itoa(int(version))) return 0, errors.New("Wrong metadata version: " + strconv.Itoa(int(version)))
} }