tmain.go: rename fields, add q_t - ags-upload - Insert AGS files to a database
(HTM) git clone git://src.adamsgaard.dk/ags-upload
(DIR) Log
(DIR) Files
(DIR) Refs
---
(DIR) commit b989db1ba48edb13663f924329b895434d18df80
(DIR) parent b08da215c078c301b68291b5c298ad34c50ca130
(HTM) Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Wed, 8 Oct 2025 14:16:24 +0200
main.go: rename fields, add q_t
Diffstat:
M cmd/main.go | 37 ++++++++++++++++---------------
1 file changed, 19 insertions(+), 18 deletions(-)
---
(DIR) diff --git a/cmd/main.go b/cmd/main.go
t@@ -8,8 +8,8 @@ import (
"log"
"net/http"
"os"
- "strings"
"strconv"
+ "strings"
"time"
"github.com/gin-gonic/gin"
t@@ -29,17 +29,18 @@ type CptInfo struct {
}
type Cpt struct { // group SCPG - data
- ID uint `gorm:"primaryKey"`
- InfoId uint //foreign key from CptInfo
- LocationId string // LOCA_ID
- TestReference string // SCPG_TESN
+ ID uint `gorm:"primaryKey"`
+ InfoId uint //foreign key from CptInfo
+ LocationId string // LOCA_ID
+ TestReference string // SCPG_TESN
Depth *float64 // SCPT_DPTH
- ConeRes *float64 // SCPT_RES
- SideFric *float64 // SCPT_FRES
- Pore1 *float64 // SCPT_PWP1
- Pore2 *float64 // SCPT_PWP2
- Pore3 *float64 // SCPT_PWP3
- FrictionRatio *float64 // SCPT_FRR
+ Qc *float64 // SCPT_RES
+ Fs *float64 // SCPT_FRES
+ U1 *float64 // SCPT_PWP1
+ U2 *float64 // SCPT_PWP2
+ U3 *float64 // SCPT_PWP3
+ Rf *float64 // SCPT_FRR
+ Qt *float64 // SCPT_QT
}
func ParseAGSProjectAndSCPT(r io.Reader) (*CptInfo, []Cpt, error) {
t@@ -142,12 +143,13 @@ func ParseAGSProjectAndSCPT(r io.Reader) (*CptInfo, []Cpt, error) {
LocationId: get("SCPT", data, "LOCA_ID"),
TestReference: get("SCPT", data, "SCPG_TESN"),
Depth: parseF64Ptr(get("SCPT", data, "SCPT_DPTH")),
- ConeRes: parseF64Ptr(get("SCPT", data, "SCPT_RES")),
- SideFric: parseF64Ptr(get("SCPT", data, "SCPT_FRES")),
- Pore1: parseF64Ptr(get("SCPT", data, "SCPT_PWP1")),
- Pore2: parseF64Ptr(get("SCPT", data, "SCPT_PWP2")),
- Pore3: parseF64Ptr(get("SCPT", data, "SCPT_PWP3")),
- FrictionRatio: parseF64Ptr(get("SCPT", data, "SCPT_FRR")),
+ Qc: parseF64Ptr(get("SCPT", data, "SCPT_RES")),
+ Fs: parseF64Ptr(get("SCPT", data, "SCPT_FRES")),
+ U1: parseF64Ptr(get("SCPT", data, "SCPT_PWP1")),
+ U2: parseF64Ptr(get("SCPT", data, "SCPT_PWP2")),
+ U3: parseF64Ptr(get("SCPT", data, "SCPT_PWP3")),
+ Rf: parseF64Ptr(get("SCPT", data, "SCPT_FRR")),
+ Qt: parseF64Ptr(get("SCPT", data, "SCPT_QT")),
})
default:
// ignore other groups for now
t@@ -162,7 +164,6 @@ func ParseAGSProjectAndSCPT(r io.Reader) (*CptInfo, []Cpt, error) {
return project, cpts, nil
}
-
func dos2unix(r io.Reader) (io.Reader, error) {
all, err := io.ReadAll(r)
if err != nil {