From 8f47986db00b9722aeea05574ab952009b8dce71 Mon Sep 17 00:00:00 2001 From: Marco Molinaro Date: Tue, 29 Aug 2023 16:06:50 +0200 Subject: [PATCH 01/17] proposal to remove RESOURCE uniqueness in response --- ConeSearch.tex | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ConeSearch.tex b/ConeSearch.tex index 2897d41..f7c923a 100755 --- a/ConeSearch.tex +++ b/ConeSearch.tex @@ -208,8 +208,9 @@ \section{Service Interface Requirements} The VOTable MUST comply with these conditions: \begin{itemize} - \item There must be a single RESOURCE in the VOTable, - and that contains a single TABLE. + \item There must be a single RESOURCE with \texttt{type=''results''} in the VOTable, + and that RESOURCE must contain a single TABLE. Additional RESOURCE(s) are + allowed to enable, e.g., DataLink service descriptors. \item The TABLE must have FIELDS where the following UCD values have been set. There must only be one FIELD with each of these UCDs: From 87adb1e534a3a640ea6516abf75bb2bb2ef17436 Mon Sep 17 00:00:00 2001 From: Marco Molinaro Date: Tue, 29 Aug 2023 18:18:07 +0200 Subject: [PATCH 02/17] SR and MAXREC behaviour --- ConeSearch.tex | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/ConeSearch.tex b/ConeSearch.tex index 2897d41..c256a56 100755 --- a/ConeSearch.tex +++ b/ConeSearch.tex @@ -143,7 +143,7 @@ \section{Service Interface Requirements} not significant. \item The baseURL and constraint list are concatenated to form the query. - \item The set of query constraints must include the + \item The set of query constraints MUST include the following parameters, which are interpreted by the service with the stated meaning: \begin{description} @@ -153,13 +153,25 @@ \section{Service Interface Requirements} \item[\textbf{DEC}] a declination in the ICRS coordinate system for the positon of the center of the cone to search, given in decimal degrees. - \item[\textbf{SR}] the radius of - the cone to search, given in decimal degrees. + \item[\textbf{SR}] the radius of the cone to search, given in decimal degrees. + If set to zero (SR=0) it should not return an error condition because the + request might describe an interest in retrieving only the metadata structure + of the service's response (i.e. discovery of the FIELDS delivered by the service). + This is similar to setting MAXREC=0, i.e. a service metadata request as prescribed + by DALI\footnote{SR=0 is kept in this version of this specification for back + compatibility. It is suggested to prefer the usage of MAXREC to enable metadata + discovery}\citep{2017ivoa.spec.0517D}. \end{description} \begin{bigdescription} \item[Example] \url{http://mycone.org/cgi-bin/search?RA=180.567&DEC=-30.45&SR=0.0125} \end{bigdescription} + \item As defined by DALI a SHOULD also understand the following parameter: + \begin{description} + \item[\textbf{MAXREC}] to let the client limit the number of records returned + or require a service metadata response. Its usage is encouraged and preferred + to the SR=0 solution for metadata discovery. + \end{description} \item The query MAY contain the optional parameter, \textbf{VERB}, whose value is an integer--either 1, 2, or 3--indicating verbosity which determines how many columns are to be returned in the @@ -322,11 +334,7 @@ \section{Service Interface Requirements} Southern hemisphere and the catalog coverage is in the Northern hemisphere. This type of query is different from an error return; it should return a VOTable as described above, with metadata, but no data - records. In particular, a zero value of Search Radius should not return - an error condition. This is because an application may be more - interested in the metadata than the data, and send a fixed query (for - example RA=0\&DEC=90\&SR=0) simply to discover the fields delivered by - the service. + records. \end{enumerate} \section{The Resource Profile} From de1703632fb28b4dbe945acf4eb3cd765708a357 Mon Sep 17 00:00:00 2001 From: Marco Molinaro Date: Wed, 8 Nov 2023 17:17:36 +0100 Subject: [PATCH 03/17] ivoatex update --- ivoatex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivoatex b/ivoatex index 30e1cfd..ffdbc09 160000 --- a/ivoatex +++ b/ivoatex @@ -1 +1 @@ -Subproject commit 30e1cfd64f9d0d621a8c23d85628e50729daf42b +Subproject commit ffdbc0983d69ff1ecddf14e82dd71e4cf5ae4fa4 From 59d28d22ff6e25ce245575c47b04dff094c1a832 Mon Sep 17 00:00:00 2001 From: Marco Molinaro Date: Wed, 8 Nov 2023 17:17:36 +0100 Subject: [PATCH 04/17] ivoatex update --- ivoatex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivoatex b/ivoatex index 30e1cfd..ffdbc09 160000 --- a/ivoatex +++ b/ivoatex @@ -1 +1 @@ -Subproject commit 30e1cfd64f9d0d621a8c23d85628e50729daf42b +Subproject commit ffdbc0983d69ff1ecddf14e82dd71e4cf5ae4fa4 From 6481303fef190bb6d5b7279acca9d3592f670a7c Mon Sep 17 00:00:00 2001 From: Marco Molinaro Date: Thu, 26 Sep 2024 14:00:33 +0200 Subject: [PATCH 05/17] ivoatex update and gitmeta added --- .gitignore | 4 ++++ ConeSearch.tex | 1 + Makefile | 2 +- ivoatex | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1202507..31b17e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ ivoatexmeta.tex +gitmeta.tex ConeSearch.aux ConeSearch.bbl ConeSearch.blg @@ -6,4 +7,7 @@ ConeSearch.log ConeSearch.out ConeSearch.pdf ConeSearch.toc +ConeSearch.hd +ConeSearch.fls +ConeSearch.fdb_latexmk ConeSearch.html diff --git a/ConeSearch.tex b/ConeSearch.tex index f7c923a..e199945 100755 --- a/ConeSearch.tex +++ b/ConeSearch.tex @@ -1,5 +1,6 @@ \documentclass[11pt,a4paper]{ivoa} \input tthdefs +\input gitmeta \usepackage{todonotes} \usepackage{listings} diff --git a/Makefile b/Makefile index 519f65b..a9fd61a 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ AUTHOR_EMAIL=marco.molinaro@inaf.it # Source files for the TeX document (but the main file must always # be called $(DOCNAME).tex) -SOURCES = $(DOCNAME).tex +SOURCES = $(DOCNAME).tex gitmeta.tex # List of image files to be included in submitted package (anything that # can be rendered directly by common web browsers) diff --git a/ivoatex b/ivoatex index ffdbc09..85a59fe 160000 --- a/ivoatex +++ b/ivoatex @@ -1 +1 @@ -Subproject commit ffdbc0983d69ff1ecddf14e82dd71e4cf5ae4fa4 +Subproject commit 85a59fe8e6abd86bbe3ef4e12fd3dade71a54924 From e7bf751828bd0448700e813953c27ae54108bd2f Mon Sep 17 00:00:00 2001 From: Marco Molinaro Date: Mon, 30 Sep 2024 09:31:03 +0200 Subject: [PATCH 06/17] github build workflow fix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 72b5cde..79afad7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: test -f ${{ env.doc_name }}.bbl - name: Keep the PDF artefact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: PDF Preview path: ${{ env.doc_name }}.pdf From 927ab6397499f8cc6e068a3a00a9f9b7dedf12d4 Mon Sep 17 00:00:00 2001 From: Marco Molinaro Date: Mon, 30 Sep 2024 09:35:35 +0200 Subject: [PATCH 07/17] re-added (myself) as co-editot/author --- ConeSearch.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ConeSearch.tex b/ConeSearch.tex index e199945..d561b04 100755 --- a/ConeSearch.tex +++ b/ConeSearch.tex @@ -14,13 +14,13 @@ \ivoagroup{Data Access Layer} \author[http://www.ivoa.net/twiki/bin/view/IVOA/RayPlante]{Raymond Plante} -%\author[http://www.ivoa.net/twiki/bin/view/IVOA/MarcoMolinaro]{Marco Molinaro} +\author[http://www.ivoa.net/twiki/bin/view/IVOA/MarcoMolinaro]{Marco Molinaro} %\author[http://www.ivoa.net/twiki/bin/view/IVOA/MarkusDemleitner]{Markus Demleitner} \author[http://www.ivoa.net/twiki/bin/view/IVOA/BobHanisch]{Robert Hanisch} \author[http://www.ivoa.net/twiki/bin/view/IVOA/AlexSzalay]{Alex Szalay} \author[http://www.ivoa.net/twiki/bin/view/IVOA/RoyWilliams]{Roy Williams} -\editor{Ray Plante} +\editor{Ray Plante, Marco Molinaro} \previousversion[http://www.ivoa.net/Documents/ConeSearch/20200828/index.html]{WD 1.1 2020-08-28} \previousversion[http://www.ivoa.net/Documents/REC/DAL/ConeSearch-20080222.html]{REC 1.03} From bed1ec0c476f7b8a775112a75a39b1bacf5910b5 Mon Sep 17 00:00:00 2001 From: Marco Molinaro Date: Mon, 30 Sep 2024 09:39:56 +0200 Subject: [PATCH 08/17] clarified ASERICS/ESCAPE contribution --- ConeSearch.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ConeSearch.tex b/ConeSearch.tex index d561b04..39679e9 100755 --- a/ConeSearch.tex +++ b/ConeSearch.tex @@ -58,7 +58,7 @@ \section*{Acknowledgments} Research Program under Cooperative Agreement AST0122449 with The Johns Hopkins University. -The ConeSearch-1.1 revision has been developed and supported under the +The ConeSearch-1.1 revision has been initially supported under the ASTERICS and ESCAPE projects (funded by the European Commission Framework Programme Horizon 2020 Research and Innovation Action, grant agreements n. 653477 and n. 824064 respectively). Work done within the From 59615fdcebd6157e927e7e088597cfe07f55e3f0 Mon Sep 17 00:00:00 2001 From: Marco Molinaro Date: Tue, 8 Oct 2024 15:55:53 +0200 Subject: [PATCH 09/17] fixing auto PDF preview workflow --- .github/workflows/preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 8dcf6b4..28395fb 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -35,7 +35,7 @@ jobs: test -f ${{ env.doc_name }}.bbl - name: Move the auto-pdf-preview tag - uses: weareyipyip/walking-tag-action@v1 + uses: weareyipyip/walking-tag-action@v2 with: TAG_NAME: auto-pdf-preview TAG_MESSAGE: | From a9389d5f14204a18207f21ba638303da666113ee Mon Sep 17 00:00:00 2001 From: Marco Molinaro Date: Mon, 14 Oct 2024 15:35:00 +0200 Subject: [PATCH 10/17] continue fixing preview yml --- .github/workflows/preview.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 28395fb..4282933 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -37,8 +37,8 @@ jobs: - name: Move the auto-pdf-preview tag uses: weareyipyip/walking-tag-action@v2 with: - TAG_NAME: auto-pdf-preview - TAG_MESSAGE: | + tag-name: auto-pdf-preview + tag-message: | Last commit taken into account for the automatically updated PDF preview of this IVOA document. env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 27c1c8e20bcb00155f5631839acef7d277d2474a Mon Sep 17 00:00:00 2001 From: Marco Molinaro Date: Thu, 26 Sep 2024 14:00:33 +0200 Subject: [PATCH 11/17] ivoatex update and gitmeta added --- .gitignore | 4 ++++ ConeSearch.tex | 1 + Makefile | 2 +- ivoatex | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1202507..31b17e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ ivoatexmeta.tex +gitmeta.tex ConeSearch.aux ConeSearch.bbl ConeSearch.blg @@ -6,4 +7,7 @@ ConeSearch.log ConeSearch.out ConeSearch.pdf ConeSearch.toc +ConeSearch.hd +ConeSearch.fls +ConeSearch.fdb_latexmk ConeSearch.html diff --git a/ConeSearch.tex b/ConeSearch.tex index c256a56..fc320af 100755 --- a/ConeSearch.tex +++ b/ConeSearch.tex @@ -1,5 +1,6 @@ \documentclass[11pt,a4paper]{ivoa} \input tthdefs +\input gitmeta \usepackage{todonotes} \usepackage{listings} diff --git a/Makefile b/Makefile index 519f65b..a9fd61a 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ AUTHOR_EMAIL=marco.molinaro@inaf.it # Source files for the TeX document (but the main file must always # be called $(DOCNAME).tex) -SOURCES = $(DOCNAME).tex +SOURCES = $(DOCNAME).tex gitmeta.tex # List of image files to be included in submitted package (anything that # can be rendered directly by common web browsers) diff --git a/ivoatex b/ivoatex index ffdbc09..85a59fe 160000 --- a/ivoatex +++ b/ivoatex @@ -1 +1 @@ -Subproject commit ffdbc0983d69ff1ecddf14e82dd71e4cf5ae4fa4 +Subproject commit 85a59fe8e6abd86bbe3ef4e12fd3dade71a54924 From 4ee2c52d1eb82e16f0f85b88f37fcec50734be8b Mon Sep 17 00:00:00 2001 From: Marco Molinaro Date: Mon, 30 Sep 2024 09:31:03 +0200 Subject: [PATCH 12/17] github build workflow fix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 72b5cde..79afad7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: test -f ${{ env.doc_name }}.bbl - name: Keep the PDF artefact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: PDF Preview path: ${{ env.doc_name }}.pdf From b33ff934984ecdc4135fce58f668c0140be5a932 Mon Sep 17 00:00:00 2001 From: Marco Molinaro Date: Mon, 30 Sep 2024 09:35:35 +0200 Subject: [PATCH 13/17] re-added (myself) as co-editot/author --- ConeSearch.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ConeSearch.tex b/ConeSearch.tex index fc320af..6315196 100755 --- a/ConeSearch.tex +++ b/ConeSearch.tex @@ -14,13 +14,13 @@ \ivoagroup{Data Access Layer} \author[http://www.ivoa.net/twiki/bin/view/IVOA/RayPlante]{Raymond Plante} -%\author[http://www.ivoa.net/twiki/bin/view/IVOA/MarcoMolinaro]{Marco Molinaro} +\author[http://www.ivoa.net/twiki/bin/view/IVOA/MarcoMolinaro]{Marco Molinaro} %\author[http://www.ivoa.net/twiki/bin/view/IVOA/MarkusDemleitner]{Markus Demleitner} \author[http://www.ivoa.net/twiki/bin/view/IVOA/BobHanisch]{Robert Hanisch} \author[http://www.ivoa.net/twiki/bin/view/IVOA/AlexSzalay]{Alex Szalay} \author[http://www.ivoa.net/twiki/bin/view/IVOA/RoyWilliams]{Roy Williams} -\editor{Ray Plante} +\editor{Ray Plante, Marco Molinaro} \previousversion[http://www.ivoa.net/Documents/ConeSearch/20200828/index.html]{WD 1.1 2020-08-28} \previousversion[http://www.ivoa.net/Documents/REC/DAL/ConeSearch-20080222.html]{REC 1.03} From 3a99f93145bd734fc4e8d73b2b950dcc6cf8146f Mon Sep 17 00:00:00 2001 From: Marco Molinaro Date: Mon, 30 Sep 2024 09:39:56 +0200 Subject: [PATCH 14/17] clarified ASERICS/ESCAPE contribution --- ConeSearch.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ConeSearch.tex b/ConeSearch.tex index 6315196..2bde21e 100755 --- a/ConeSearch.tex +++ b/ConeSearch.tex @@ -58,7 +58,7 @@ \section*{Acknowledgments} Research Program under Cooperative Agreement AST0122449 with The Johns Hopkins University. -The ConeSearch-1.1 revision has been developed and supported under the +The ConeSearch-1.1 revision has been initially supported under the ASTERICS and ESCAPE projects (funded by the European Commission Framework Programme Horizon 2020 Research and Innovation Action, grant agreements n. 653477 and n. 824064 respectively). Work done within the From 00e96adf01734ddff7514f8dc6153c9c1d070332 Mon Sep 17 00:00:00 2001 From: Marco Molinaro Date: Tue, 8 Oct 2024 15:55:53 +0200 Subject: [PATCH 15/17] fixing auto PDF preview workflow --- .github/workflows/preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 8dcf6b4..28395fb 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -35,7 +35,7 @@ jobs: test -f ${{ env.doc_name }}.bbl - name: Move the auto-pdf-preview tag - uses: weareyipyip/walking-tag-action@v1 + uses: weareyipyip/walking-tag-action@v2 with: TAG_NAME: auto-pdf-preview TAG_MESSAGE: | From e2b42b4979b322fb581dfaf78c835388d3ad8337 Mon Sep 17 00:00:00 2001 From: Marco Molinaro Date: Mon, 14 Oct 2024 15:35:00 +0200 Subject: [PATCH 16/17] continue fixing preview yml --- .github/workflows/preview.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 28395fb..4282933 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -37,8 +37,8 @@ jobs: - name: Move the auto-pdf-preview tag uses: weareyipyip/walking-tag-action@v2 with: - TAG_NAME: auto-pdf-preview - TAG_MESSAGE: | + tag-name: auto-pdf-preview + tag-message: | Last commit taken into account for the automatically updated PDF preview of this IVOA document. env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 249d658dcfcfc9ade65169ce4c48b556fde9c21e Mon Sep 17 00:00:00 2001 From: Marco Molinaro Date: Thu, 17 Oct 2024 11:50:43 +0200 Subject: [PATCH 17/17] fix missing word in MAXREC preamble --- ConeSearch.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ConeSearch.tex b/ConeSearch.tex index 2bde21e..15d3edd 100755 --- a/ConeSearch.tex +++ b/ConeSearch.tex @@ -167,7 +167,7 @@ \section{Service Interface Requirements} \item[Example] \url{http://mycone.org/cgi-bin/search?RA=180.567&DEC=-30.45&SR=0.0125} \end{bigdescription} - \item As defined by DALI a SHOULD also understand the following parameter: + \item As defined by DALI a service SHOULD also understand the following parameter: \begin{description} \item[\textbf{MAXREC}] to let the client limit the number of records returned or require a service metadata response. Its usage is encouraged and preferred