Merge pull request #776 from SlideRuleEarth/carlos-dev4

Regression with new Duckdb: Error loading file,reading metadata or cr…

Author: cugarteblair

web-client/src/stores/fieldNameStore.ts

@@ -370,8 +370,14 @@ export const useFieldNameStore = defineStore('fieldNameStore', () => {
     if (recordInfo && recordInfo.z) {
       hFieldCache.value[reqId] = recordInfo.z
       return recordInfo.z
+    } else {
+      if (recordInfo) {
+        logger.warn('Recordinfo found but no z field', { reqId, recordInfo })
+      } else {
+        logger.warn('No recordinfo found in getHFieldName for reqId:', { reqId })
+      }
     }
-    logger.debug('No z field in recordinfo, falling back to hardcoded', { reqId })
+    logger.warn('No z field in recordinfo, falling back to hardcoded', { reqId })
     // Fall back to hardcoded
     return getCachedValue(hFieldCache.value, reqId, getHFieldNameForAPIStr)
   }

web-client/src/utils/SrDuckDb.ts

@@ -466,12 +466,13 @@ export class DuckDBClient {
       try {
         await duckDB.registerFileURL(name, url, DuckDBDataProtocol.HTTP, true)
       } catch (error: any) {
-        if ('File already registered' in error) {
+        const errorMsg = error instanceof Error ? error.message : String(error)
+        if (errorMsg.includes('File already registered')) {
           isRegistered = true
           //console.log('insertOpfsParquet File already registered');
         } else {
           logger.error('insertOpfsParquet registerFileURL error', {
-            error: error instanceof Error ? error.message : String(error)
+            error: errorMsg
           })
           throw error
         }

web-client/src/utils/workerDomUtils.ts

@@ -503,6 +503,45 @@ export async function processRunSlideRuleClicked(rc: SrRunContext | null = null)
       if (reqParamsStore.getMissionValue() === 'ICESat-2') {
         if (reqParamsStore.getIceSat2API()) {
           srReqRec.parameters = reqParamsStore.getAtlxxReqParams(srReqRec.req_id) as AtlxxReqParams
+
+          // Validate parameter consistency with API
+          const api = reqParamsStore.getIceSat2API()
+          const hasFit = !!srReqRec.parameters?.parms?.fit
+          const hasPhoreal = !!srReqRec.parameters?.parms?.phoreal
+
+          // Valid APIs for fit: 'atl03' (will become 'atl03x-surface'), 'atl03x-surface'
+          // Valid APIs for phoreal: 'atl03' (will become 'atl03x-phoreal'), 'atl03x-phoreal'
+          const validApisForFit = ['atl03', 'atl03x-surface']
+          const validApisForPhoreal = ['atl03', 'atl03x-phoreal']
+
+          if (hasFit && !validApisForFit.includes(api)) {
+            useSrToastStore().error(
+              'Parameter Mismatch',
+              `Parameters contain 'fit' but API is '${api}'. The 'fit' parameter requires API 'atl03' or 'atl03x-surface'. Please check your parameters.`
+            )
+            logger.error('API and parameter mismatch', {
+              api,
+              hasFit,
+              expectedApis: validApisForFit
+            })
+            requestsStore.setConsoleMsg('Parameter validation failed')
+            return
+          }
+
+          if (hasPhoreal && !validApisForPhoreal.includes(api)) {
+            useSrToastStore().error(
+              'Parameter Mismatch',
+              `Parameters contain 'phoreal' but API is '${api}'. The 'phoreal' parameter requires API 'atl03' or 'atl03x-phoreal'. Please check your parameters.`
+            )
+            logger.error('API and parameter mismatch', {
+              api,
+              hasPhoreal,
+              expectedApis: validApisForPhoreal
+            })
+            requestsStore.setConsoleMsg('Parameter validation failed')
+            return
+          }
+
           if (reqParamsStore.getIceSat2API() === 'atl03' && srReqRec.parameters?.parms?.fit) {
             srReqRec.func = 'atl03x-surface'
           } else if (