update

GeoNet · Nov 23, 2024 · a1e5edd · a1e5edd
1 parent 821e990
commit a1e5edd
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 295 deletions.
diff --git a/meta/placenames.go b/meta/placenames.go
@@ -30,7 +30,7 @@ var placenameHeaders Header = map[string]int{
 }
 
 var PlacenameTable Table = Table{
-	name:    "Name",
+	name:    "Placename",
 	headers: placenameHeaders,
 	primary: []string{"Name"},
 	native:  []string{"Latitude", "Longitude", "Level"},

diff --git a/meta/sqlite/db.go b/meta/sqlite/db.go
@@ -453,9 +453,7 @@ func (d DB) Init(ctx context.Context, list []meta.TableList) error {
 				return err
 			}
 		default:
-			log.Println(l.List)
-
-			log.Println(l.Table.Name())
+			log.Printf("ignoring %s", l.Table.Name())
 		}
 	}
 

diff --git a/meta/sqlite/monument.go b/meta/sqlite/monument.go
diff --git a/meta/sqlite/network.go b/meta/sqlite/network.go
diff --git a/meta/sqlite/response.go b/meta/sqlite/response.go
@@ -0,0 +1,20 @@
+package sqlite
+
+const responseCreate = `
+DROP TABLE IF EXISTS response;
+CREATE TABLE IF NOT EXISTS response (
+  response_id INTEGER PRIMARY KEY NOT NULL,
+  response TEXT NOT NULL,
+  UNIQUE (response)
+);`
+
+var response = Table{
+	Create: responseCreate,
+	Select: func() string {
+		return "SELECT response_id FROM response WHERE response = ?"
+	},
+	Insert: func() string {
+		return "INSERT OR IGNORE INTO response (response) VALUES (?);"
+	},
+	Fields: []string{"Response"},
+}
diff --git a/meta/sqlite/sample.go b/meta/sqlite/sample.go
diff --git a/meta/sqlite/site.go b/meta/sqlite/site.go
diff --git a/meta/sqlite/sql.go b/meta/sqlite/sql.go
diff --git a/meta/sqlite/station.go b/meta/sqlite/station.go
@@ -319,7 +319,7 @@ CREATE TABLE IF NOT EXISTS class_citation (
   UNIQUE (class_id, citation_id)
 );`
 
-var classCitations = Table{
+var classCitation = Table{
 	Create: classCitationCreate,
 	Select: func() string {
 		return fmt.Sprintf("SELECT class_citation_id FROM class_citation WHERE class_id = (%s) AND citation_id = (%s)",

diff --git a/meta/table.go b/meta/table.go
@@ -1,6 +1,7 @@
 package meta
 
 import (
+	"slices"
 	"sort"
 )
 
@@ -174,7 +175,7 @@ func (s *Set) KeyValue(name, label, desc string, entries map[string]string) Tabl
 
 // TableList returns a pre-built set of Tables and associated Lists.
 func (s *Set) TableList(extra ...TableList) []TableList {
-	return append([]TableList{
+	return append(slices.Clone(extra), []TableList{
 		{Table: NetworkTable, List: NetworkList(s.Networks())},
 		{Table: StationTable, List: StationList(s.Stations())},
 		{Table: SiteTable, List: SiteList(s.Sites())},
@@ -214,5 +215,5 @@ func (s *Set) TableList(extra ...TableList) []TableList {
 		{Table: TelemetryTable, List: TelemetryList(s.Telemetries())},
 		{Table: TimingTable, List: TimingList(s.Timings())},
 		{Table: VisibilityTable, List: VisibilityList(s.Visibilities())},
-	}, extra...)
+	}...)
 }