fixed routestops ... needed a reverse sort; added test/debug script f…

…or routestops

gtfsdb/api.py

@@ -20,3 +20,4 @@ def database_load(filename, **kwargs):
     gtfs = GTFS(filename)
     gtfs.load(db, **kwargs)
     return db
+

gtfsdb/model/route.py

@@ -187,7 +187,7 @@ def load(cls, db, **kwargs):
                     trips.append(t)
 
             # step 2: sort our list of trips by length (note: for trips with two directions, ...)
-            trips = sorted(trips, key=lambda t: t.trip_len)
+            trips = sorted(trips, key=lambda t: t.trip_len, reverse=True)
 
             # PART A: we're going to just collect a list of unique stop ids for this route / directions 
             for d in [0, 1]:

gtfsdb/scripts.py

@@ -4,8 +4,21 @@
 from gtfsdb.model.base import Base
 from gtfsdb.api import database_load
 
-
 def gtfsdb_load():
+    kwargs = get_args()
+    db = database_load(args.file, **kwargs)
+
+def route_stop_load():
+    ''' written as a test / debug method for RS table loader '''
+    from gtfsdb import Database, RouteStop
+    kwargs = get_args()
+    db = Database(**kwargs)
+    #import pdb; pdb.set_trace()
+    RouteStop.load(db, **kwargs)
+
+def get_args():
+    ''' database load command-line arg parser and help util...
+    '''
     tables = sorted([t.name for t in Base.metadata.sorted_tables])
     parser = argparse.ArgumentParser(prog='gtfsdb-load',
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
@@ -30,4 +43,4 @@ def gtfsdb_load():
         tables=args.tables,
         url=args.database_url,
     )
-    db = database_load(args.file, **kwargs)
+    return kwargs

setup.py

@@ -1,42 +1,45 @@
-from setuptools import setup, find_packages
-import sys
-
-
-extras_require = dict(
-    dev=[],
-    geo=['geoalchemy>=0.7.2'],
-    oracle=['cx_oracle>=5.1'],
-    postgresql=['psycopg2>=2.4.2'],
-)
-
-install_requires = ['sqlalchemy == 0.8.6', ]
-if sys.version_info[:2] <= (2, 6):
-    install_requires.append('argparse>=1.2.1')
-    extras_require['dev'].append('unittest2')
-
-setup(
-    name='gtfsdb',
-    version='0.1.6dev',
-    description='GTFS Database',
-    long_description=open('README').read(),
-    keywords='GTFS',
-    author='Mike Gilligan',
-    author_email='[email protected]',
-    packages=find_packages(),
-    include_package_data=True,
-    zip_safe=False,
-    install_requires=install_requires,
-    extras_require=extras_require,
-    entry_points={
-        'console_scripts': ['gtfsdb-load = gtfsdb.scripts:gtfsdb_load']
-    },
-    classifiers=(
-        'Development Status :: 4 - Beta',
-        'Environment :: Console',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: GNU General Public License (GPL)',
-        'Natural Language :: English',
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
-    ),
-)
+from setuptools import setup, find_packages
+import sys
+
+
+extras_require = dict(
+    dev=[],
+    geo=['geoalchemy>=0.7.2'],
+    oracle=['cx_oracle>=5.1'],
+    postgresql=['psycopg2>=2.4.2'],
+)
+
+install_requires = ['sqlalchemy == 0.8.6', ]
+if sys.version_info[:2] <= (2, 6):
+    install_requires.append('argparse>=1.2.1')
+    extras_require['dev'].append('unittest2')
+
+setup(
+    name='gtfsdb',
+    version='0.1.6dev',
+    description='GTFS Database',
+    long_description=open('README').read(),
+    keywords='GTFS',
+    author='Mike Gilligan',
+    author_email='[email protected]',
+    packages=find_packages(),
+    include_package_data=True,
+    zip_safe=False,
+    install_requires=install_requires,
+    extras_require=extras_require,
+    entry_points={
+        'console_scripts': [
+            'gtfsdb-load = gtfsdb.scripts:gtfsdb_load',
+            'rs-test = gtfsdb.scripts:route_stop_load'
+        ]
+    },
+    classifiers=(
+        'Development Status :: 4 - Beta',
+        'Environment :: Console',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Natural Language :: English',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+    ),
+)