Update CDPP conf.

Benjamin Renard
1 parent 98a327e4
Showing 17 changed files with 42 additions and 315 deletions Show diff stats
.gitmodules
conf/.env
conf/000-default.conf
conf/awstats.dachs.conf
conf/dachs-dockerfile
conf/defaultmeta.txt
conf/docker-compose.yml
conf/gavo.rc
conf/id_rsa-phamy.prive
conf/id_rsa.prive
conf/id_rsalesidaner.pub
conf/logo_big.png
conf/logo_medium.png
conf/myconf.conf
services/amdadb
services/planets/data/Masses2.csv
services/planets/q.rd
@@ -0,0 +1,3 @@
+[submodule "services/amdadb"]
+	path = services/amdadb
+	url = git@voparis-gitlab.obspm.fr:vespa/dachs/services/omp/cdpp-epntap.irap.omp.eu/amdadb.git
 # enter here all key = value you need to path in docker-compose.yaml file
 VERSION=11
-SERVER=voparis-tap-planeto
+SERVER=cdpp-tap
 # depot sans l'extension .git
-GIT=voparis-tap-planeto
-GITURL=https://gitlab.obspm.fr/phamy
+GIT=cdpp-tap
+GITURL=https://gitlab.irap.omp.eu/CDPP/
@@ -4,7 +4,7 @@
 # ************************************
  
 <VirtualHost *:8080>
-  ServerAdmin pierre.lesidaner@obspm.fr
+  ServerAdmin amda@irap.omp.eu
   ## Vhost docroot
   DocumentRoot "/var/www"
   ## Alias declarations for resources outside the DocumentRoot
@@ -153,7 +153,7 @@ LogSeparator=&quot; &quot;
 # Example: "ftp.domain.com"
 # Example: "domain.com"
 #
-SiteDomain="myserver.mydomain"
+SiteDomain="irap.omp.eu"
  
  
 # Enter here all other possible domain names, addresses or virtual host
@@ -168,7 +168,7 @@ SiteDomain=&quot;myserver.mydomain&quot;
 # Note: You can also use @/mypath/myfile if list of aliases are in a file.
 # Example: "www.myserver.com localhost 127.0.0.1 REGEX[mydomain\.(net|org)$]"
 #
-HostAliases="localhost 127.0.0.1 myserver.mydomain mydomain"
+HostAliases="localhost 127.0.0.1 cdpp-epntap.irap.omp.eu"
  
  
 # If you want to have hosts reported by name instead of ip address, AWStats
@@ -40,12 +40,12 @@ RUN apt-get install -y openssh-server openssh-client apache2 w3m
 ###
  
 RUN mkdir -p /root/.ssh
-RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCx1IuqhW3UJmKWc6ODuhXu58CSdHGavVJaTUILUsR3ig359wRQ7GEpwXdk5dcTNOS16xVVx8KP7SEqsOOGRQ14jy2z3rJLZ0tRKzceCk1nXrFgipJ8qU0sFDc+dvXgJ94XvHlZzgQDT/iLeIZ6lhDEHn6O+EdfNf1g32LqIFXEe4fqRsKsM4ssYcHigdh3cdVDU350ACNxRrVEzCRE9lcGcfouwjSNMeWZO5SnCIzl7sOGJroYmL/c17P1YPIE1HzW3FjNI98FxJR2K/TmcUWJYDc7wDalN6HXyquoFsew7Sn/BZH0aprdaTLO1F820MTUIzcF/oKvhMd/Ihz355srm//a4PGQE7RDPdvPSjOr9KSiM/PU0GiARARex1AYl/a4CY5HnKeIs/sJfOADFJTpDcF7TSqKYq51JN1itWNmVMv8zZ/rfHMiEHKiDxLXZsflmdKPynHLI/Wk+uQqLNyORQ5MWJwKRGOp5haoCKxUtHPU68woVO1uk4FawXI0yLp84iXO7RJrr5MMas+Cjzv/azWA/K1WXOjiiWIqAoOHAYKWS2embavVHgIpbK/0wn8q5BF18QBOlqlpkBICOLTXpBLB+tAjmw998nYMF5PKI8synjzHGytd79OtrphO+ADWrCQuWDSxqkzbisJUMn3m1a4Z5CaaX1kjIL0P4RlvLw== phamy" >> /root/.ssh/authorized_keys
+RUN echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL8LvPlnTGHhoqSARTPjjlxxHJPJ9oS+vvx7TmpC51e4 GitLab OBSPM" >> /root/.ssh/authorized_keys
 RUN chmod 700 /root/.ssh
 RUN chmod 600 /root/.ssh/authorized_keys
  
 RUN mkdir -p /home/dachsroot/.ssh
-RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCx1IuqhW3UJmKWc6ODuhXu58CSdHGavVJaTUILUsR3ig359wRQ7GEpwXdk5dcTNOS16xVVx8KP7SEqsOOGRQ14jy2z3rJLZ0tRKzceCk1nXrFgipJ8qU0sFDc+dvXgJ94XvHlZzgQDT/iLeIZ6lhDEHn6O+EdfNf1g32LqIFXEe4fqRsKsM4ssYcHigdh3cdVDU350ACNxRrVEzCRE9lcGcfouwjSNMeWZO5SnCIzl7sOGJroYmL/c17P1YPIE1HzW3FjNI98FxJR2K/TmcUWJYDc7wDalN6HXyquoFsew7Sn/BZH0aprdaTLO1F820MTUIzcF/oKvhMd/Ihz355srm//a4PGQE7RDPdvPSjOr9KSiM/PU0GiARARex1AYl/a4CY5HnKeIs/sJfOADFJTpDcF7TSqKYq51JN1itWNmVMv8zZ/rfHMiEHKiDxLXZsflmdKPynHLI/Wk+uQqLNyORQ5MWJwKRGOp5haoCKxUtHPU68woVO1uk4FawXI0yLp84iXO7RJrr5MMas+Cjzv/azWA/K1WXOjiiWIqAoOHAYKWS2embavVHgIpbK/0wn8q5BF18QBOlqlpkBICOLTXpBLB+tAjmw998nYMF5PKI8synjzHGytd79OtrphO+ADWrCQuWDSxqkzbisJUMn3m1a4Z5CaaX1kjIL0P4RlvLw== phamy" >> /home/dachsroot/.ssh/authorized_keys
+RUN echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL8LvPlnTGHhoqSARTPjjlxxHJPJ9oS+vvx7TmpC51e4 GitLab OBSPM" >> /home/dachsroot/.ssh/authorized_keys
 RUN chmod 700 /home/dachsroot/.ssh
 RUN chmod 600 /home/dachsroot/.ssh/authorized_keys
 RUN chown dachsroot:gavo -R /home/dachsroot/.ssh
@@ -56,7 +56,8 @@ RUN chown dachsroot:gavo -R /home/dachsroot/.ssh
 ###
  
 RUN mkdir $PATH$SERVER -p
-RUN git clone $GITURL/$GIT.git $HOMEPATH/$SERVER/$GIT
+RUN git clone -c http.sslVerify=0 $GITURL/$GIT.git $HOMEPATH/$SERVER/$GIT
+RUN cd $HOMEPATH/$SERVER/$GIT && git submodule update --init && cd services/amdadb && git pull origin update
  
 #on déplace les fichiers
 RUN cp $HOMEPATH/$SERVER/$GIT/conf/000-default.conf /etc/apache2/sites-enabled/000-default.conf
-publisher: Paris Astronomical Data Centre
-publisherID: ivo://vopdc.obspm
-contact.name: PADC support team
-contact.address: 77 av. Denfert Rochereau, 75014 Paris, FRANCE
-contact.email: vo.paris@obspm.fr 
-contact.telephone: 0033140512082
-creator.name: PADC
-creator.logo: http://voparis-srv-paris.obspm.fr/logos/PADC_small.png 
-authority.creationDate: 2012-01-09T12:53:33
-authority.title: Paris Astronomical Data Centre Authority
-authority.shortName: PADC
-authority.description: The Paris Astronomical Data Centre project aims at providing VO access to its databases ressources, at participating to international standards developments, at implementing VO compliant simulation codes, data visualization and analysis software. This Naming Authority is used to identify the resources provided by Paris Astronomical Data Centre at Observatoire de Paris, Paris, FRANCE
-authority.referenceURL: http://padc.obspm.fr
-authority.managingOrg: ivo://vopdc
-organization.title: Observatoire de Paris
-organization.description: Founded in 1667, the Observatoire de Paris is the largest national research center for astronomy.
-organization.referenceURL: http://www.obspm.fr
-site.description: The Paris Astronomical Data Centre project aims at providing VO access to its databases ressources, at participating to international standards developments, at implementing VO compliant simulation codes, data visualization and analysis software.
+publisher: CDPP - Centre de Données de la Physique des Plasmas
+publisherID: ivo://cdpp
+contact.name: CDPP team
+contact.address: IRAP, 9 Av. du Colonel Roche, 31400 Toulouse, FRANCE
+contact.email: cdpp@irap.omp.eu
+contact.telephone: 0033561558370
+creator.name: CDPP
+creator.logo: http://cdpp.irap.omp.eu/templates/CDPP/favicon.ico
+authority.creationDate: 2022-12-09T12:53:33
+authority.title: Centre de Données de la Physique des Plasmas
+authority.shortName: CDPP
+authority.description: Created in 1998 jointly by CNES and INSU, the CDPP assures the long term preservation of data obtained primarily from instruments built using French resources, and renders them readily accessible and exploitable by the international community. The CDPP also provides services to enable on-line data analysis (AMDA), 3D data visualization in context (3DView), propagation tool and space weather tool which bridges solar perturbations to in-situ measurements. The CDPP is involved in the development of interoperability, participates in several Virtual Observatory projects, and supports data distribution for scientific missions (Solar Orbiter, JUICE).
+authority.referenceURL: http://www.cdpp.eu/
+authority.managingOrg: ivo://cdpp
+organization.title: CDPP - Centre de Données de la Physique des Plasmas
+organization.description: Created in 1998 jointly by CNES and INSU, the CDPP assures the long term preservation of data obtained primarily from instruments built using French resources, and renders them readily accessible and exploitable by the international community. The CDPP also provides services to enable on-line data analysis (AMDA), 3D data visualization in context (3DView), propagation tool and space weather tool which bridges solar perturbations to in-situ measurements. The CDPP is involved in the development of interoperability, participates in several Virtual Observatory projects, and supports data distribution for scientific missions (Solar Orbiter, JUICE).
+organization.referenceURL: http://www.cdpp.eu/
+site.description: Created in 1998 jointly by CNES and INSU, the CDPP assures the long term preservation of data obtained primarily from instruments built using French resources, and renders them readily accessible and exploitable by the international community. The CDPP also provides services to enable on-line data analysis (AMDA), 3D data visualization in context (3DView), propagation tool and space weather tool which bridges solar perturbations to in-situ measurements. The CDPP is involved in the development of interoperability, participates in several Virtual Observatory projects, and supports data distribution for scientific missions (Solar Orbiter, JUICE).
  
@@ -2,8 +2,8 @@ version: &quot;3.5&quot;
 services:
  
   dachs:
-    container_name: dachs-voparis
-    image: dachs-voparis
+    container_name: dachs-cdpp
+    image: dachs-cdpp
     tty: true
     expose:
       - "80"
@@ -26,4 +26,4 @@ services:
  
 secrets:
   id_rsa:
-    file: id_rsa-phamy.prive
+    file: rsa.prive
 [general]
 rootDir: /var/gavo
-maintainerAddress: pierre.lesidaner@obspm.fr
+maintainerAddress: cdpp@irap.omp.eu
 [web]
 bindAddress:
 serverPort: 80
 #serverURL: http://145.238.197.199:81
 serverURL: http://127.0.0.1:80
-sitename: portablelp
+sitename: CDPP EPN-TAP server
 corsOriginPat: http.*
 logFormat: combined
 [ivoa]
-authority: vopdc.obspm 
+authority: cdpp
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJo++rVp4x81Wu528nJieQob3aG1D5a6kD6ELOphVP0Rd2lTyxqlOFhXtgw7tM7bFTbwshqyO79mnOcVeGm7gkwGyjykORPHibD6yOkiSsc5D1sTFbsI2Hkm7eftkpv9lVmi/VIiV6bRpVM+EbvQoCNiR5m/DStlabfQALnF9z2xu+H3+oTUuO7X6jamSJRSrBTz/ILdf1gb6bT7ndYryttt4ITzcPHiH+dyJWR0AQCOGC8HvzrLURujSm2310Qfqo80YAmTm3zN5ABxD76ib5Hd87Lh4jwY8jxhSFBV2ZnMHJQyCqpm7JAXisD95NWr3EFPlNbbVeMvJMZ4pPshI7 lesidaner@psl-e4200
-my_servername=voparis-test
-my_domain=obspm.fr
-maintainer_email=vo.paris@obspm.fr
-authority_ivoid="ivo://vopdc.obspm"
+my_servername=cdpp-epntap
+my_domain=irap.omp.eu
+maintainer_email=cdpp@irap.omp.eu
+authority_ivoid="ivo://cdpp"
@@ -0,0 +1 @@
+Subproject commit b30eda811cc19b92c7f84c77ec44ae5f5089fdf1
@@ -1,9 +0,0 @@
-target_name,mean_radius,mean_radius_uncertainty,equatorial_radius,equatorial_radius_uncertainty,polar_radius,polar_radius_uncertainty,rms_deviation,elevation_max,elevation_min,mass,distance_to_primary,sideral_rotation_period,obs_idi,thumbnail_url
-Mercury,2439.7,1.0,2439.7,1.0,2439.7,1.0,1,4.6,2.5,3.3014E23,57909227.,1407.504,1,http://www.lesia.obspm.fr/BDIP/bdip_icone/bdip8397.jpg
-Venus,6051.8,1.0,6051.8,1.0,6051.8,1.0,1,11,2,4.86732E24,108209475.,-5832.432,2,http://www.lesia.obspm.fr/BDIP/bdip_icone/bdip7534.jpg
-Earth,6371.00,0.01,6378.14, 0.01,6356.75, 0.01,3.57,8.85,11.52,5.97219E24,149598262.,23.93447232,3,http://www.lesia.obspm.fr/BDIP/bdip_icone/bdip7534.jpg
-Mars,3389.5,0.2,3396.19,0.1,3376.,0.1,3.0,22.64,7.55,6.41693E23,227943824.,24.624,4,http://www.lesia.obspm.fr/BDIP/bdip_icone/bdip3073.jpg,http://www.lesia.obspm.fr/BDIP/bdip_icone/bdip3073.jpg
-Jupiter,69911.,6,71492.,4,66854.,10,62.1,31,102,1.89813E27,778340821.,9.92496,5,http://www.lesia.obspm.fr/BDIP/bdip_icone/bdip0001.jpg
-Saturn,58232.,6,60268.,4,54364.,10,102.9,8,205,5.68319E26,1426666422.,10.656,6,http://www.lesia.obspm.fr/BDIP/bdip_icone/bdip2716.jpg
-Uranus,25362.,7,25559.,4,24973.,20,16.8,28,0,8.68103E25,2870658186.,-17.232,7,http://www.lesia.obspm.fr/BDIP/bdip_icone/bdip2716.jpg
-Neptune,24622.,19,24764.,15,24341.,30,8,14,0,1.0241E26,4498396441.,16.104,8,http://www.lesia.obspm.fr/BDIP/bdip_icone/bdip2716.jpg
@@ -1,267 +0,0 @@
-<resource schema="planets">
-  <meta name="title">Characteristics of Planets (demo)</meta>
-  <meta name="shortname">Planets</meta>
-  <meta name="shortName">Planets</meta>
-  <meta name="description" format="plain">
-Demonstration service of EPN-TAP v1: main characteristics of planets. Data are included in the table, therefore most relevant parameters are non-standard in EPN-TAP. Data are retrieved from Archinal et al 2009 (IAU report, 2011CeMDA.109..101A) [radii] and Cox et al 2000 (Allen's astrophysical quantities, 2000asqu.book.....C) [masses, heliocentric distances, and rotation periods]. </meta>
-  <meta name="creationDate">2015-08-16T09:42:00Z</meta>
-  <meta name="subject">planet</meta>
-  <meta name="subject">mass</meta>
-  <meta name="subject">radius</meta>
-  <meta name="subject">period</meta>
-  <meta name="copyright">LESIA-Obs Paris</meta>
-  <meta name="creator.name">Stephane Erard</meta>
-  <meta name="publisher">Paris Astronomical Data Centre - LESIA</meta>
-  <meta name="contact.name">Stephane Erard</meta>
-  <meta name="contact.email">vo.paris@obspm.fr</meta>
-  <meta name="contact.address">Observatoire de Paris VOPDC, bat. Perrault, 77 av. Denfert Rochereau, 75014 Paris, FRANCE</meta>
-  <meta name="source">2000asqu.book.....C</meta>
-  <meta name="contentLevel">General</meta>
-  <meta name="contentLevel">University</meta>
-  <meta name="contentLevel">Research</meta>
-  <meta name="contentLevel">Amateur</meta>
-  <meta name="utype">ivo://vopdc.obspm/std/EpnCore#schema-2.0</meta>
-
-
-
-<!-- METADATA COMPLETE -->
-
-    <table id="epn_core" onDisk="true" adql="True">
-        <mixin spatial_frame_type="celestial"
-        optional_columns= "time_scale publisher bib_reference thumbnail_url" >//epntap2#table-2_0</mixin>
-
-
-        <column name="distance_to_primary"  type="double precision"
-            tablehead="Distance_to_primary"  unit="km"
-              description="Extra: Mean heliocentric distance (semi-major axis)"
-              ucd="pos.distance;stat.min" 
-            verbLevel="2"/>
-
-        <column name="mean_radius"    type="double precision" 
-            tablehead="Mean_radius"  unit="km"
-              description="Extra: Mean radius (1 bar level on giant planets)"
-              ucd="phys.size.radius"
-            verbLevel="2"/>
-
-        <column name="mean_radius_uncertainty"    type="double precision" 
-            tablehead="Mean_radius_uncertainty"  unit="km"
-              description="Extra: Uncertainty on mean radius"
-              ucd="phys.size.radius;stat.error"
-            verbLevel="2"/>
-
-        <column name="equatorial_radius"    type="double precision" 
-            tablehead="Equatorial_radius"  unit="km"
-              description="Extra: equatorial radius (1 bar level on giant planets)"
-              ucd="phys.size.radius"
-            verbLevel="2"/>
-
-        <column name="equatorial_radius_uncertainty"    type="double precision" 
-            tablehead="Equatorial_radius_uncertainty"  unit="km"
-              description="Extra: Uncertainty on equatorial radius"
-              ucd="phys.size.radius;stat.error"
-            verbLevel="2"/>
-
-        <column name="polar_radius"    type="double precision" 
-            tablehead="Polar_radius"  unit="km"
-              description="Extra: polar radius (1 bar level on giant planets)"
-              ucd="phys.size.radius"
-            verbLevel="2"/>
-
-        <column name="polar_radius_uncertainty"    type="double precision" 
-            tablehead="Polar_radius_uncertainty"  unit="km"
-              description="Extra: Uncertainty on polar radius"
-              ucd="phys.size.radius;stat.error"
-            verbLevel="2"/>
-
-        <column name="rms_deviation"    type="double precision" 
-            tablehead="RMS_deviation"  unit="km"
-              description="Extra: Average departure from ellipsoid"
-              ucd="phys.size.radius;stat.stdev"
-            verbLevel="2"/>
-
-        <column name="elevation_min"    type="double precision" 
-            tablehead="Elevation_min"  unit="km"
-              description="Deepest depression relative to ellipsoid"
-            ucd="pos.bodyrc.alt;stat.min"
-            verbLevel="2"/>
-
-        <column name="elevation_max"    type="double precision" 
-            tablehead="Elevation_max"  unit="km"
-              description="Highest relief relative to ellipsoid"
-            ucd="pos.bodyrc.alt;stat.max"
-            verbLevel="2"/>
-
-        <column name="mass"    type="double precision" 
-            tablehead="Mass"  unit="kg"
-              description="Mass of planet"
-               ucd="phys.mass"
-            verbLevel="2"/>
-
-        <column name="sideral_rotation_period"    type="double precision" 
-            tablehead="Sideral_rotation_period"  unit="h"
-              description="Rotation period (internal for giant planets)"
-              ucd="time.period.rotation"
-            verbLevel="2"/>
-
-            <column name="ds_id" type="text"
-                tablehead="Dataset ID"
-                description="Identifier for this object to use when calling 
-                        datalink services"
-                ucd="meta.id"/>
-
-            <column name="datalink_url" type="text"
-                tablehead="Datalink"
-                description="Datalinks and services for this object"
-                ucd="meta.ref.url;meta.datalink"/>
-    </table>
-
-<!-- TABLE COMPLETE -->
-
-    <data id="import">
-        <sources>data/Masses2.csv</sources>
-        <csvGrammar>
-            <rowfilter procDef="//products#define">
-                <bind name="table">"\schema.epn_core"</bind>
-            </rowfilter>
-        </csvGrammar>
-
-        <make table="epn_core">
-            <rowmaker idmaps="*">
-                <var key="dataproduct_type">"ci"</var>
-                <var key="spatial_frame_type">"none"</var>
-
-                <var key="target_name" source="target_name" />
-                <var key="granule_uid" source="target_name" />
-                <var key="granule_gid">"Planet" </var>
-                <var key="obs_id">"N/A"</var>
-                <!--  <var key="target_class">"planet" </var> -->
-                <!--  <var key="time_scale">"UTC" </var> -->
-
-
-                <var key="distance_to_primary" source="distance_to_primary" />
-
-                <var key="creation_date">"2015-08-20T07:54:00.00" </var>
-                <var key="modification_date">"2017-12-15T17:54:00.00" </var>
-                <var key="release_date">"2015-08-20T07:54:00.00" </var>
-
-                <var key="service_title">"planets" </var>
-                <var key="bib_reference">"2011CeMDA.109..101A#2000asqu.book.....C"</var>
-                <var key="publisher">"LESIA" </var>
-                                <var key="target_class">"planet"</var>
-
-                                <!-- the id for our datalink services is artificial: it's
-                                just the concatenation of the object class and the object name
-                                -->
-                                <var key="ds_id">@target_class+"/"+@target_name</var>
-                                <var key="datalink_url">("\getConfig{web}{serverURL}/\rdId/epdl/dlmeta"
-                                        +"?ID="+urllib.parse.quote(@ds_id))</var> 
-
-                <apply procDef="//epntap2#populate-2_0" name="fillepn">
-                    <bind name="granule_gid">@granule_gid</bind>
-                    <bind name="granule_uid">@granule_uid</bind>
-                    <bind name="obs_id">@obs_id</bind>
-                    <bind name="target_class">@target_class</bind>
-                    <bind name="time_scale">"UTC"</bind>
-
-                    <bind name="target_name">@target_name</bind>
-                    <bind name="instrument_host_name">""</bind>
-                    <bind name="instrument_name">""</bind>
-
-
-                    <bind key="processing_level">5</bind>
-
-                    <bind name="dataproduct_type">@dataproduct_type</bind>
-                    <bind name="measurement_type">"phys.mass#phys.size.radius"</bind>
-
-
-                    <bind name="service_title">@service_title</bind>
-                    <bind name="creation_date">@creation_date</bind>
-                    <bind name="modification_date">@modification_date</bind>
-                    <bind name="release_date">@release_date</bind>
-
-                </apply>
-                <map key="thumbnail_url">@thumbnail_url</map>
-            </rowmaker>
-        </make>
-    </data>
-
-    <service id="epdl" allowed="dlget,dlmeta">
-        <datalinkCore>
-            <metaMaker>
-                <code>
-                    yield MS(InputKey, name="epoch", 
-                        type="double precision",
-                        unit="d", ucd="meta.epoch",
-                        description="Time the ephemeris is to be computed for, JD",
-                        multiplicity="forced-single",
-                        values=MS(Values,
-                            min=2400000,
-                            max=3000000))
-                </code>
-            </metaMaker>
-
-            <metaMaker>
-                <code>
-                    with base.getTableConn() as conn:
-                         url = list(conn.query("SELECT thumbnail_url from \schema.epn_core where"
-                                " target_class=%(targetClass)s and target_name=%(targetName)s", {
-                                "targetClass": descriptor.targetClass,
-                                "targetName": descriptor.targetName}))[0][0]
-                    yield LinkDef(descriptor.pubDID,
-                        url,
-                        description="A preview of the planet",
-                        semantics="#preview",
-                        contentType="image/jpeg")
-                </code>
-            </metaMaker>
-
-            <descriptorGenerator>
-            <setup>
-                <code>
-                    class PlanetDescriptor(object):
-                        def __init__(self, pubDID):
-                            self.pubDID = pubDID
-                            self.targetClass, self.targetName = self.pubDID.split("/", 1)
-                            self.computeEphemerisId()
-
-                        def computeEphemerisId(self):
-                                shortClass = {
-                                        'planet': 'p',
-                                        'satellite': 's',
-                                }[self.targetClass]
-                                self.ephId = "{}:{}".format(
-                                        shortClass, self.targetName)
-                        description="computed ephemeris of the planet",
-                </code>
-            </setup>
-                <code>
-                    return PlanetDescriptor(pubDID)
-                </code>
-            </descriptorGenerator>
-
-            <dataFunction>
-                <setup>
-                    <par name="upstream_service_url"
-                        >"http://vo.imcce.fr/webservices/miriade/ephemcc_query.php?-from=vespa&amp;"</par>
-                    <code>
-            
-	    from urllib.parse import urlencode
-            from gavo.svcs import WebRedirect
-	    import urllib.parse
-                    </code>
-                </setup>
-                <code>
-                    parameters = {
-                        "-name": descriptor.ephId,
-                        "-ep": args["epoch"],
-                    }
-                    raise WebRedirect(upstream_service_url+urlencode(parameters))
-                </code>
-            </dataFunction>
-        </datalinkCore>
-    </service>
-       <data id="collection" auto="false">
-       <make table="epn_core"/>
-       <publish/>
-    </data>
-</resource>