fixed merging

diff --git a/gotovienna/routing.py b/gotovienna/routing.py
index 31cf95c..f9a714e 100644 (file)
--- a/gotovienna/routing.py
+++ b/gotovienna/routing.py
@@ -105,9 +105,6 @@ def search(origin_tuple, destination_tuple, dtime=None):
     destination, destination_city = split_station(destination)
 
 
-    if not origin_type in POSITION_TYPES or\
-        not destination_type in POSITION_TYPES:
-
     if origin_type is None:
         origin_type = guess_location_type(origin)
         print 'Guessed origin type:', origin_type

diff --git a/itip b/itip
index 4af78b1..931057c 100755 (executable)
--- a/itip
+++ b/itip
@@ -85,24 +85,6 @@ if args.line in itip.lines:
             print '  No departure information.'
         print
 else:
-    s = ''
-
-if l and l in lines:
-    stations = itip.get_stations(l)
-    for key in stations.keys():
-        if not s:
-            print '* %s:' % key
-        for station in stations[key]:
-            if s:
-                if s.startswith(station[0]) or station[0].startswith(s):
-                    if station[0] == key:
-                        # skip station if destination
-                        continue
-                    # FIXME
-                    print '* %s\n  %s .....' % (key, station[0]), itip.get_departures(station[1])
-            else:
-                print '    %s' % station[0]
-elif not l:
     ITEMS_PER_LINE = 12
     ITEM_WIDTH = 5
     LINE_WIDTH = (ITEMS_PER_LINE*ITEM_WIDTH + ITEMS_PER_LINE)
@@ -124,4 +106,4 @@ elif not l:
                     range(min(len(remaining), ITEMS_PER_LINE))]
             print ' '.join(('%%%ds' % ITEM_WIDTH) % x for x in this_row)
 
-        print
+        print
\ No newline at end of file

diff --git a/scotty b/scotty
index c768149..0449023 100755 (executable)
--- a/scotty
+++ b/scotty
@@ -36,123 +36,6 @@ print >>sys.stderr, 'Searching...\n',
 parser = do_search(args)
 print >>sys.stderr, 'done.'
 
-finished = False
-while not finished:
-
-    html = search((args.origin, args.ot), (args.destination, args.dt)).read()
-    
-    parser = sParser(html)
-    state = parser.check_page()
-
-    if state == PageType.CORRECTION:
-        try:
-            cor = parser.get_correction()
-            origin, origin_place = split_station(args.origin)
-            destination, destination_place = split_station(args.destination)
-            
-            # FIXME refactoring
-            
-            if cor.has_key('origin'):
-                print
-                print '* Origin ambiguous:'
-                l = None
-                while not l or not l.isdigit() or int(l) > len(cor['origin']):
-                    i = 1
-                    for c in cor['origin']:
-                        print '%d. %s' % (i, c)
-                        i += 1
-                    l = sys.stdin.readline().strip()
-    
-                origin = cor['origin'][int(l) - 1]
-    
-            if cor.has_key('destination'):
-                print
-                print '* Destination ambiguous:'
-                l = None
-                while not l or not l.isdigit() or int(l) > len(cor['destination']):
-                    i = 1
-                    for c in cor['destination']:
-                        print '%d. %s' % (i, c)
-                        i += 1
-                    l = sys.stdin.readline().strip()
-    
-                destination = cor['destination'][int(l) - 1]
-                
-            if cor.has_key('origin_place'):
-                print
-                print '* Origin place ambiguous:'
-                l = None
-                while not l or not l.isdigit() or int(l) > len(cor['origin_place']):
-                    i = 1
-                    for c in cor['origin_place']:
-                        print '%d. %s' % (i, c)
-                        i += 1
-                    l = sys.stdin.readline().strip()
-    
-                origin_place = cor['origin_place'][int(l) - 1]
-    
-            if cor.has_key('destination_place'):
-                print
-                print '* Destination place ambiguous:'
-                l = None
-                while not l or not l.isdigit() or int(l) > len(cor['destination_place']):
-                    i = 1
-                    for c in cor['destination_place']:
-                        print '%d. %s' % (i, c)
-                        i += 1
-                    l = sys.stdin.readline().strip()
-    
-                destination_place = cor['destination_place'][int(l) - 1]
-                
-            args.origin = '%s, %s' % (origin, origin_place)
-            args.destination = '%s, %s' %(destination, destination_place)
-            
-        except ParserError:
-            print 'PANIC at correction page'
-            finished = True
-    
-    elif state == PageType.RESULT:
-        parser = rParser(html)
-        try:
-            overviews = parser.overview
-            details = parser.details
-            l = ''
-            while not l == 'q':
-                for idx, overview in enumerate(overviews):
-                    timespan = overview['timespan']
-                    if not timespan:
-                        # XXX: Bogus data for e.g. Pilgramgasse->Karlsplatz?!
-                        continue
-                    
-                    str_timespan = timespan[0].strftime('[%y-%d-%m] %H:%M')
-                    str_timespan += '-' + timespan[1].strftime('%H:%M')
-                    timedelta = timespan[1] - timespan[0]
-                    print '%d. %s (%s)' % (idx + 1,
-                            str_timespan,
-                            timedelta)
-                print 'q. Quit'
-                l = sys.stdin.readline().strip()
-                print
-                print '~' * 80
-    
-                if l.isdigit() and int(l) <= len(details):
-                    for detail in details[int(l) - 1]:
-                        if detail['timespan'] and detail['station']:
-                            time = '%s - %s' % (detail['timespan'][0].strftime(TIMEFORMAT), detail['timespan'][1].strftime(TIMEFORMAT))
-                            print '[%s] %s\n%s' % (time, ' -> '.join(detail['station']), '\n'.join(detail['info']))
-                        else:
-                            print '\n'.join(detail['info'])
-                        print '-' * 80
-                print
-        
-            finished = True
-        
-        except ParserError:
-            print 'parsererror'
-    
-    elif state == PageType.UNKNOWN:
-        print 'PANIC unknown result'
-
 while parser.state == PageType.CORRECTION:
     origin_corr, destination_corr = parser.get_correction()
 
@@ -187,15 +70,18 @@ if parser.state == PageType.RESULT:
     l = ''
     while not l == 'q':
         for idx, overview in enumerate(overviews):
-            if not overview['date'] or not overview['time']:
+            timespan = overview['timespan']
+            if not timespan:
                 # XXX: Bogus data for e.g. Pilgramgasse->Karlsplatz?!
                 continue
-
-            print '%d. [%s] %s-%s (%s)' % (idx + 1,
-                    overview['date'],
-                    overview['time'][0],
-                    overview['time'][1],
-                    overview['duration'])
+            
+            str_timespan = timespan[0].strftime('[%Y-%d-%m] %H:%M')
+            str_timespan += '-' + timespan[1].strftime('%H:%M')
+            timedelta = timespan[1] - timespan[0]
+            print '%d. %s (%s)' % (idx + 1,
+                    str_timespan,
+                    timedelta)
+        
         print 'q. Quit'
         l = sys.stdin.readline().strip()
         print
@@ -203,13 +89,12 @@ if parser.state == PageType.RESULT:
 
         if l.isdigit() and int(l) <= len(details):
             for detail in details[int(l) - 1]:
-                if detail['time'] and detail['station']:
-                    time = '%s - %s' % (detail['time'][0].strftime(TIMEFORMAT), detail['time'][1].strftime(TIMEFORMAT))
+                if detail['timespan'] and detail['station']:
+                    time = '%s - %s' % (detail['timespan'][0].strftime(TIMEFORMAT), detail['timespan'][1].strftime(TIMEFORMAT))
                     print '[%s] %s\n%s' % (time, ' -> '.join(detail['station']), '\n'.join(detail['info']))
                 else:
                     print '\n'.join(detail['info'])
                 print '-' * 79
         print
 else:
-    print 'Error - unknown page returned.'
-
+    print 'Error - unknown page returned.'
\ No newline at end of file