Changeset 3657 for DPPP


Ignore:
Timestamp:
20/03/08 12:22:27 (11 years ago)
Author:
mkochan
Message:

Changed to version 1.0b.

Location:
DPPP/kml/csml2kml/python
Files:
1 added
25 edited

Legend:

Unmodified
Added
Removed
  • DPPP/kml/csml2kml/python/csml2kml/csml2kml/config/ar4.wms2kml.conf.xml

    r3654 r3657  
    99  </WMSRequest> 
    1010  <OutputRootDirectory>/home/users/mkochan/svn-root/kml/csml2kml/output/wms-ar4</OutputRootDirectory> 
    11   <ServerRootDirectory>http://bond.badc.rl.ac.uk:8089</ServerRootDirectory> 
     11  <ServerRootDirectory>http://superglue.badc.rl.ac.uk:8084</ServerRootDirectory> 
    1212</WMSLayers2KML> 
  • DPPP/kml/csml2kml/python/csml2kml/csml2kml/config/midas.csml2kml.conf.xml

    r3656 r3657  
    33  <UseRegions>yes</UseRegions> 
    44  <GetAllStationsRequestURL><![CDATA[http://bond.badc.rl.ac.uk:8084/geoserver/wfs?request=getFeature&service=wfs&version=1.1.0&typename=np:Station&maxFeatures=100000]]></GetAllStationsRequestURL> 
    5   <BalloonTemplate>&lt;h2&gt;Station $[station_name]&lt;/h2&gt;Click here to see the list of &lt;a href=&quot;http://bond.badc.rl.ac.uk:8089/csmlGrapher/list?station_name=$[station_name]&quot;&gt;CSML features associated with this station&lt;/a&gt; (this will open a window of your default web browser).</BalloonTemplate> 
     5  <BalloonTemplate>&lt;h2&gt;Station $[station_name]&lt;/h2&gt;Click here to see the list of &lt;a href=&quot;http://superglue.badc.rl.ac.uk:8089/csmlGrapher/list?station_name=$[station_name]&quot;&gt;CSML features associated with this station&lt;/a&gt; (this will open a window of your default web browser).</BalloonTemplate> 
    66  <StationData> 
    77    <Datum name="station_id">#ID#</Datum> 
  • DPPP/kml/csml2kml/python/csml2kml/csml2kml/config/midas_small_subset.csml2kml.conf.xml

    r3654 r3657  
    33  <UseRegions>yes</UseRegions> 
    44  <GetAllStationsRequestURL><![CDATA[http://bond.badc.rl.ac.uk:8084/geoserver/wfs?request=getFeature&service=wfs&version=1.1.0&typename=np:Station&maxFeatures=100]]></GetAllStationsRequestURL> 
    5   <BalloonTemplate>&lt;h2&gt;Station $[station_name]&lt;/h2&gt;Click here to see the list of &lt;a href=&quot;http://bond.badc.rl.ac.uk:8089/csmlGrapher/list?station_name=$[station_name]&quot;&gt;CSML features associated with this station&lt;/a&gt; (this will open a window of your default web browser).</BalloonTemplate> 
     5  <BalloonTemplate>&lt;h2&gt;Station $[station_name]&lt;/h2&gt;Click here to see the list of &lt;a href=&quot;http://superglue.badc.rl.ac.uk:8089/csmlGrapher/list?station_name=$[station_name]&quot;&gt;CSML features associated with this station&lt;/a&gt; (this will open a window of your default web browser).</BalloonTemplate> 
    66  <StationData> 
    77    <Datum name="station_id">#ID#</Datum> 
  • DPPP/kml/csml2kml/python/csml2kml/csml2kml/config/obs.wms2kml.conf.xml

    r3654 r3657  
    99  </WMSRequest> 
    1010  <OutputRootDirectory>/home/users/mkochan/svn-root/kml/csml2kml/python/csml2kml/csml2kml/output/wms-obs</OutputRootDirectory> 
    11   <ServerRootDirectory>http://bond.badc.rl.ac.uk:8089</ServerRootDirectory> 
     11  <ServerRootDirectory>http://superglue.badc.rl.ac.uk:8084</ServerRootDirectory> 
    1212</WMSLayers2KML> 
  • DPPP/kml/csml2kml/python/csml2kml/csml2kml/scripts/stations2kml.py

    r3640 r3657  
    11import sys 
    22from csml2kml.StationConvertor import StationConvertor 
    3 from cElementTree import ElementTree 
     3from csml2kml.ET import ElementTree 
    44 
    55# Get the config file name 
  • DPPP/kml/csml2kml/python/csml2kml/csml2kml/scripts/wms2kml.py

    r3595 r3657  
    11import sys 
    2 from cElementTree import ElementTree, XML 
     2from csml2kml.ET import ElementTree, XML 
    33from csml2kml.utils import wget 
    44from csml2kml.WMSLayer import WMSCapabilities 
  • DPPP/kml/csml2kml/python/csml2kml/setup.py

    r3656 r3657  
    22 
    33setup(name='csml2kml', 
    4       version='1.0a', 
     4      version='1.0b', 
    55      install_depends=['csml>=2.0b'], 
    66      packages=find_packages(), 
  • DPPP/kml/csml2kml/python/csml2kmlpylon/csml2kmlpylon.egg-info/PKG-INFO

    r3592 r3657  
    11Metadata-Version: 1.0 
    22Name: csml2kmlpylon 
    3 Version: 0.0.0dev-r3590 
    4 Summary: UNKNOWN 
     3Version: 1.0b 
     4Summary: Web service providing dynamic content for KML documents generated by the csml2kml package. 
    55Home-page: UNKNOWN 
    6 Author: UNKNOWN 
     6Author: Martin Kochan, for British Atmospheric Data Centre, UK 
    77Author-email: UNKNOWN 
    88License: UNKNOWN 
  • DPPP/kml/csml2kml/python/csml2kmlpylon/csml2kmlpylon.egg-info/SOURCES.txt

    r3592 r3657  
    2020csml2kmlpylon/config/environment.py 
    2121csml2kmlpylon/config/environment.pyc 
     22csml2kmlpylon/config/midas.csml2kmlpylon.conf.xml 
    2223csml2kmlpylon/config/middleware.py 
    2324csml2kmlpylon/config/middleware.pyc 
  • DPPP/kml/csml2kml/python/csml2kmlpylon/csml2kmlpylon.egg-info/requires.txt

    r3590 r3657  
    11Pylons>=0.9.6.1 
     2csml2kml>=1.0b 
  • DPPP/kml/csml2kml/python/csml2kmlpylon/csml2kmlpylon/config/midas.csml2kmlpylon.conf.xml

    r3641 r3657  
    22  <DisplayIntervalStart>1-1-2003</DisplayIntervalStart> 
    33  <DisplayIntervalEnd>31-1-2003</DisplayIntervalEnd> 
    4   <GeoServerURL>http://130.246.76.98:8084/geoserver/wfs</GeoServerURL> 
     4  <GeoServerURL>http://bond.badc.rl.ac.uk:8084/geoserver/wfs</GeoServerURL> 
     5  <ServedFromURL>http://superglue.badc.rl.ac.uk:8084/csmlGrapher</ServedFromURL> 
    56</GrapherWebService> 
  • DPPP/kml/csml2kml/python/csml2kmlpylon/csml2kmlpylon/controllers/csmlGrapher.py

    r3641 r3657  
    66# Other imports 
    77import Image 
    8 import pylab 
    98from pylab import * 
    10 from datetime import datetime, timedelta 
     9from matplotlib import dates 
    1110import re 
    12 import urllib 
    1311from cStringIO import StringIO 
    1412from tempfile import NamedTemporaryFile 
    15 from cElementTree import Element, SubElement, ElementTree, XML 
    16 from urllib import quote 
     13import urllib 
    1714 
    1815# CSML and csml2kml imports 
     
    2017import csml2kml.Station 
    2118from csml2kml.utils import wget 
     19from csml2kml.ET import Element, SubElement, ElementTree, XML 
    2220 
    2321log = logging.getLogger(__name__) 
     
    4341        self.displayIntervalEnd = dates.dateutil.parser.parse(grapherConfig.find('DisplayIntervalEnd').text) 
    4442        self.geoServerUrl = grapherConfig.find('GeoServerURL').text 
     43        self.servedFromUrl = grapherConfig.find('ServedFromURL').text 
    4544 
    4645        # Call the __call__ method of the parent class  
     
    269268                featureNameElement = SubElement(rowElement, 'td') 
    270269                anchorElement = SubElement(featureNameElement, 'a') 
    271                 linkToGrapher = 'http://bond.badc.rl.ac.uk:8089/csmlGrapher/plot?station_name=' + station_name + '&feature_id=' + stationFeature.featureId 
     270                linkToGrapher = self.servedFromUrl + '/plot?station_name=' + station_name + '&feature_id=' + stationFeature.featureId 
    272271                anchorElement.set('href', linkToGrapher) 
    273272                anchorElement.text = stationFeature.featureId 
  • DPPP/kml/csml2kml/python/csml2kmlpylon/development.ini

    r3651 r3657  
    1414use = egg:Paste#http 
    1515host = 0.0.0.0 
    16 port = 8089 
     16port = 8084 
    1717 
    1818[app:main] 
  • DPPP/kml/csml2kml/python/csml2kmlpylon/setup.cfg

    r3590 r3657  
    11[egg_info] 
    2 tag_build = dev 
    3 tag_svn_revision = true 
     2#tag_build = dev 
     3#tag_svn_revision = true 
    44 
    55[easy_install] 
  • DPPP/kml/csml2kml/python/csml2kmlpylon/setup.py

    r3590 r3657  
    88setup( 
    99    name='csml2kmlpylon', 
    10     version="", 
    11     #description='', 
    12     #author='', 
     10    version="1.0b", 
     11    description='Web service providing dynamic content for KML documents generated by the csml2kml package.', 
     12    author='Martin Kochan, for British Atmospheric Data Centre, UK', 
    1313    #author_email='', 
    1414    #url='', 
    15     install_requires=["Pylons>=0.9.6.1"], 
     15    install_requires=["Pylons>=0.9.6.1", "csml2kml>=1.0b"], 
    1616    packages=find_packages(exclude=['ez_setup']), 
    1717    include_package_data=True, 
Note: See TracChangeset for help on using the changeset viewer.