Changeset 355

Show
Ignore:
Timestamp:
09/29/06 13:17:55 (2 years ago)
Author:
sgillies
Message:

fix handling of geometry input, and enhance coverage tests

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • PleiadesGeocoder/trunk/adapters/simple.py

    r346 r355  
    110110            if len(point) == 3: 
    111111                value = ' '.join([value, "%f %f %f" % point]) 
    112             if len(point) == 2: 
     112            elif len(point) == 2: 
    113113                value = ' '.join([value, "%f %f 0.0" % point]) 
    114114            else: 
    115115                raise ValueError, \ 
    116                 "Insufficient number of ordinates: %s" % point 
     116                "Insufficient number of ordinates: %s" % str(point) 
    117117        self.georef['spatialCoordinates'] = value.lstrip() 
    118118         
  • PleiadesGeocoder/trunk/tests/runcoverage

    r204 r355  
    11#!/bin/sh 
    22 
    3 PYTHON="/home/sean/pleiades/plone-sites/p1/bin/python" 
    4 INSTANCE_HOME="/home/sean/pleiades/plone-sites/p1/zope-instance" 
    5 SOFTWARE_HOME="/home/sean/pleiades/plone-sites/p1/Zope-2.9.3/lib/python" 
     3PYTHON="/usr/bin/python" 
     4INSTANCE_HOME="/home/sean/Jobs/AWMC/Pleiades/plone-sites/pleiades-dev/instance" 
     5SOFTWARE_HOME="/home/sean/Jobs/AWMC/Pleiades/plone-sites/pleiades-dev/Zope-2.9.4/lib/python" 
    66PYTHONPATH="$SOFTWARE_HOME" 
     7PRODUCTPATH="$SOFTWARE_HOME/Products/PleiadesGeocoder" 
    78export PYTHONPATH INSTANCE_HOME SOFTWARE_HOME 
    89 
     
    1011$PYTHON coverage.py -e 
    1112$PYTHON coverage.py -x runalltests.py 
    12 $PYTHON coverage.py -rm $SOFTWARE_HOME/Products/PleiadesGeocoder/*.py $SOFTWARE_HOME/Products/PleiadesGeocoder/adapters/*.py $SOFTWARE_HOME/Products/PleiadesGeocoder/adapters/simple/*.py $SOFTWARE_HOME/Products/PleiadesGeocoder/browser/*.py 
    1313 
     14echo "" 
     15echo "main coverage:" 
     16$PYTHON coverage.py -rm $PRODUCTPATH/*.py 
     17 
     18echo "" 
     19echo "content coverage:" 
     20$PYTHON coverage.py -rm $PRODUCTPATH/content/*.py 
     21 
     22echo "" 
     23echo "extensions coverage:" 
     24$PYTHON coverage.py -rm $PRODUCTPATH/Extensions/*.py 
     25 
     26echo "" 
     27echo "adapters coverage:" 
     28$PYTHON coverage.py -rm $PRODUCTPATH/adapters/*.py 
     29 
     30echo "" 
     31echo "browser coverage:" 
     32$PYTHON coverage.py -rm $PRODUCTPATH/browser/*.py 
     33