Theodor-Springmann-Stiftung/lenz-web
1
0
Fork 0
mirror of https://github.com/Theodor-Springmann-Stiftung/lenz-web.git synced 2025-10-29 09:15:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finsihed xml model & small bugfixes

Browse Source
This commit is contained in:
Simon Martens
2025-03-05 18:56:34 +01:00
parent e19fd47c17
commit e839bbebe8
46 changed files with 8928 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xml/models.go
View File

@@ -7,7 +7,7 @@ type IXMLItem interface {
// INFO:
// - Keys should be unique
// - Keys[0] has the special meaning of the primary key (for FTS etc.)
Keys() []string
Keys() []any
Type() string
}

10
xml/resolver.go
View File

@@ -9,12 +9,12 @@ import (
type Resolver[T IXMLItem] struct {
// INFO: map[type][ID]
index map[string]map[string][]Resolved[T]
index map[string]map[any][]Resolved[T]
mu sync.RWMutex
}
func NewResolver[T IXMLItem]() *Resolver[T] {
return &Resolver[T]{index: make(map[string]map[string][]Resolved[T])}
return &Resolver[T]{index: make(map[string]map[any][]Resolved[T])}
}
func (r *Resolver[T]) Add(typeName, refID string, item Resolved[T]) {
@@ -22,12 +22,12 @@ func (r *Resolver[T]) Add(typeName, refID string, item Resolved[T]) {
defer r.mu.Unlock()
if _, exists := r.index[typeName]; !exists {
r.index[typeName] = make(map[string][]Resolved[T])
r.index[typeName] = make(map[any][]Resolved[T])
}
r.index[typeName][refID] = append(r.index[typeName][refID], item)
}
func (r *Resolver[T]) Get(typeName, refID string) ([]Resolved[T], error) {
func (r *Resolver[T]) Get(typeName string, refID any) ([]Resolved[T], error) {
r.mu.RLock()
defer r.mu.RUnlock()
@@ -44,5 +44,5 @@ func (r *Resolver[T]) Clear() {
r.mu.Lock()
defer r.mu.Unlock()
r.index = make(map[string]map[string][]Resolved[T])
r.index = make(map[string]map[any][]Resolved[T])
}

2
xml/xmlprovider.go
View File

@@ -121,8 +121,6 @@ func (p *XMLParser[T]) Cleanup(latest ParseMeta) {
p.Array = append(p.Array, *item)
p.addResolvable(*item)
}
slices.SortFunc(p.Array, Sort)
}
func (p *XMLParser[T]) addResolvable(item T) {

76
xml/xmlsort.go
View File

@@ -1,77 +1 @@
package xmlparsing
import (
"strconv"
"strings"
)
func Sort[T IXMLItem](i, j T) int {
keys_a := i.Keys()
keys_b := j.Keys()
if len(keys_a) == 0 && len(keys_b) == 0 {
return 0
}
if len(keys_a) == 0 && len(keys_b) > 0 {
return -1
}
if len(keys_a) > 0 && len(keys_b) == 0 {
return 1
}
sort_a := strings.Split(keys_a[0], "-")
sort_b := strings.Split(keys_b[0], "-")
for i, item := range sort_a {
if i >= len(sort_b) {
return 1
}
// INFO: this is a bit lazy since
// - we are comparing bit values not unicode code points
// - the comparison is case sensitive
int_a, err := strconv.Atoi(item)
if err != nil {
if item < sort_b[i] {
return -1
}
if item > sort_b[i] {
return 1
}
continue
}
int_b, err := strconv.Atoi(sort_b[i])
if err != nil {
if item < sort_b[i] {
return -1
}
if item > sort_b[i] {
return 1
}
continue
}
if int_a < int_b {
return -1
}
if int_a > int_b {
return 1
}
}
if len(sort_b) > len(sort_a) {
return -1
}
return 0
}