diff --git a/docs/ingestorManual.md b/docs/ingestorManual.md index 97b0905..fb7f917 100644 --- a/docs/ingestorManual.md +++ b/docs/ingestorManual.md @@ -122,19 +122,19 @@ first. Installation is described in the appendix Installation of Tools ### Important Update since January 2025 -The SciCat stack has gone through a major upgrade, thus the command +The SciCat stack has gone through a major upgrade, thus the command line syntax has changed. -The separate executables (like datasetIngestor, datasetRetriever...) -were combined into one scicat-cli executable, with each executable's +The separate executables (like datasetIngestor, datasetRetriever...) +were combined into one scicat-cli executable, with each executable's features available as commands given as the first parameter to this executable. -These commands bear the same names as the former executables. -The general syntax change is that if you called +These commands bear the same names as the former executables. +The general syntax change is that if you called ./[COMMAND] [flags] before, now it's ./scicat-cli [COMMAND] [flags]. -Furthermore, the use of single hyphen, multi-letter flags is now discontinued, -as it went against general convention. So, in practical terms, -[long_flag_name] +Furthermore, the use of single hyphen, multi-letter flags is now discontinued, +as it went against general convention. So, in practical terms, -[long_flag_name] and --[long_flag_name] were both accepted, but now only the latter is accepted. There are backward compatible scripts in the [github repo](https://github.com/paulscherrerinstitute/scicat-cli?tab=readme-ov-file#backwards-compatibility-with-v2). @@ -817,7 +817,6 @@ To download and install the binaries, please follow these steps: 5. Open the folder and run the required APP (grant execute permissions if required) - #### Online work stations in beamline hutches The command line tools are pre-installed in /work/sls/bin. No further @@ -1442,7 +1441,7 @@ following curl command: curl -X POST --header 'Content-Type: application/json' -d '{"username":"YOUR-LOGIN","password":"YOUR-PASSWORD"}' 'https://dacat-qa.psi.ch/api/v3/auth/login' # reply if succesful: -{"access_token": "NQhe3...", "id":"NQhe3...","ttl":1209600,"created":"2019-01-22T07:03:21.422Z","userId":"5a745bde4d12b30008020843"} +{"access_token":"NQhe3...", "id":"NQhe3...","created":"2019-01-22T07:03:21.422Z","userId":"5a745bde4d12b30008020843","expires_in":604800, "ttl":604800,...} ``` The "id" field contains the access token, which you copy in to the corresponding field at the top of the explorer page.