Merge pull request #97 from linea-it/94-update-datasets-info

Update links after changes in table names.
linea-it · Jul 31, 2024 · e437235 · e437235
2 parents b060d1d + 1c76859
commit e437235
Show file tree

Hide file tree

Showing 8 changed files with 5,833 additions and 5,855 deletions.
diff --git a/compose/local/postgres/init-db.sh b/compose/local/postgres/init-db.sh
@@ -18,7 +18,7 @@ EOSQL
 psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "daiquiri_data" <<-EOSQL
     \i /data/des_dr2_sample.sql;
 EOSQL
-# -- CREATE INDEX coadd_objects_ra_dec ON des_dr2.coadd_objects USING btree (q3c_ang2ipix(ra, "dec"));
+# -- CREATE INDEX coadd_objects_ra_dec ON des_dr2.main USING btree (q3c_ang2ipix(ra, "dec"));
 
 # Create Table GAIA SAMPLE SCHEMA
 psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "daiquiri_data" <<-EOSQL

diff --git a/consume_tap.ipynb b/consume_tap.ipynb
@@ -108,7 +108,7 @@
     }
    ],
    "source": [
-    "query = \"SELECT TOP 10 coadd_object_id, ra, dec from des_dr2.coadd_objects\"\n",
+    "query = \"SELECT TOP 10 coadd_object_id, ra, dec from des_dr2.main\"\n",
     "\n",
     "tap_result = tap_service.run_sync(query, language=\"adql\")\n",
     "\n",
@@ -138,7 +138,7 @@
     }
    ],
    "source": [
-    "query = \"SELECT coadd_object_id, ra, dec from des_dr2.coadd_objects limit 10\"\n",
+    "query = \"SELECT coadd_object_id, ra, dec from des_dr2.main limit 10\"\n",
     "\n",
     "tap_result = tap_service.run_sync(query, language=\"postgresql\")\n",
     "\n",
@@ -184,7 +184,7 @@
     "lang = \"PostgreSQL\"\n",
     "query_string = \"\"\"\n",
     "SELECT ra, dec\n",
-    "FROM des_dr2.coadd_objects\n",
+    "FROM des_dr2.main\n",
     "LIMIT 100\n",
     "\"\"\"\n",
     "tap_session = requests.Session()\n",

diff --git a/daiquiri/config/settings/base.py b/daiquiri/config/settings/base.py
@@ -210,7 +210,7 @@
 CONESEARCH_ADAPTER = "daiquiri.conesearch.adapter.SimpleConeSearchAdapter"
 CONESEARCH_ANONYMOUS = True
 CONESEARCH_SCHEMA = "des_dr2"
-CONESEARCH_TABLE = "coadd_objects"
+CONESEARCH_TABLE = "main"
 CONESEARCH_SUBJECTS = ["cone search"]
 
 QUERY_FORMS = [

diff --git a/daiquiri/fixtures/initial_data.json b/daiquiri/fixtures/initial_data.json
diff --git a/daiquiri/fixtures/query_samples.json b/daiquiri/fixtures/query_samples.json
diff --git a/daiquiri/templates/core/base_navigation.html b/daiquiri/templates/core/base_navigation.html
@@ -51,25 +51,6 @@
                     </ul>
                 </li>
             </ul>
-            <ul class="nav navbar-nav">
-                <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
-                        aria-expanded="false">
-                        {% trans 'Data' %}<span class="caret"></span>
-                    </a>
-                    <ul class="dropdown-menu">
-                        <li>
-                            <a href="{% slugurl 'catalogs' %}">{% trans 'Catalogs' %}</a>
-                        </li>
-                        <li>
-                            <a href="{% slugurl 'des-dr2' %}">{% trans 'DES DR2' %}</a>
-                        </li>
-                        <li>
-                            <a href="{% slugurl 'gaia-dr3' %}">{% trans 'Gaia DR3' %}</a>
-                        </li>
-                    </ul>
-                </li>
-            </ul>
             <ul class="nav navbar-nav">
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
@@ -78,18 +59,18 @@
                     </a>
                     <ul class="dropdown-menu">
                         <li>
-                            <a href="/metadata/des">{% trans 'DES DR2' %}</a>
+                            <a href="/metadata/des_dr2">{% trans 'DES DR2' %}</a>
                             <ul class="sub-menu">
                                 <li>
-                                    <a href="/metadata/des/main/">des.main</a>
+                                    <a href="/metadata/des_dr2/main/">des_dr2.main</a>
                                 </li>
                             </ul>
                         </li>
                         <li>
-                            <a href="/metadata/gaia">{% trans 'Gaia DR3' %}</a>
+                            <a href="/metadata/gaia_dr3">{% trans 'Gaia DR3' %}</a>
                             <ul class="sub-menu">
                                 <li>
-                                    <a href="/metadata/gaia/dr3">gaia.dr3</a>
+                                    <a href="/metadata/gaia_dr3/source">gaia_dr3.source</a>
                                 </li>
                             </ul>
                         </li>
@@ -100,9 +81,6 @@
                 <li>
                     <a href="{% url 'query:query' %}">{% trans 'Query' %}</a>
                 </li>
-                <!-- <li>
-                    <a href="https://scienceserver-dev.linea.org.br/" target="_blank">Science-Server</a>
-                </li> -->
                 {% comment %} <li>
                     <a href="{% url 'contact:contact' %}">{% trans 'Contact' %}</a>
                 </li> {% endcomment %}

diff --git a/database_sample/des_dr2_sample.sql b/database_sample/des_dr2_sample.sql
diff --git a/database_sample/gaia_dr3_sample.sql b/database_sample/gaia_dr3_sample.sql