← Back to branch summary

~lore-mattei/onehundredscopes/flickr-precise

« back to all changes in this revision

Viewing changes to src/unity-scope-flickr

  • Committer: David Callé
  • Date: 2012-01-07 20:00:57 UTC
  • Revision ID: davidc@framli.eu-20120107200057-p8vsa1s9fleiyy19
Fix an issue with no search and date filter

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/unity-scope-flickr
127
127
                        date = int(date)*86400
128
128
                        now = time.time()
129
129
                        date = now - date
 
130
                        print date
130
131
                if search is '' or search == 'None':
131
132
                        search = None
132
133
 
137
138
                                data_flickr = flickr.photos_search(format='json', text=search, contacts='all', extras='url_sq, url_t',  page=page,min_taken_date=date, safe_search='3', per_page='50')
138
139
                        else:
139
140
                                data_flickr = flickr.photos_search(format='json', text=search, extras='url_sq, url_t',  page=page,min_taken_date=date, safe_search='3', per_page='50')
140
 
 
141
141
                else:
142
142
                        if taken_by == 'me':
143
 
                                data_flickr = flickr.photos_recentlyUpdated(format='json', extras='url_sq, url_t',min_date=date, page=page, safe_search='3', per_page='50')
 
143
                                if date:
 
144
                                        data_flickr = flickr.photos_recentlyUpdated(format='json', extras='url_sq, url_t',min_date=date,  page=page, safe_search='3', per_page='50')
 
145
                                else:
 
146
                                        data_flickr = flickr.photos_recentlyUpdated(format='json', extras='url_sq, url_t', min_date=1, page=page, safe_search='3', per_page='50')
144
147
                        elif taken_by == 'contacts':
145
 
                                data_flickr = flickr.photos_getContactsPhotos(format='json', extras='url_sq, url_t',  page=page,min_taken_date=date, safe_search='3', per_page='50', count='49')
 
148
                                if date:
 
149
                                        data_flickr = flickr.photos_getContactsPhotos(format='json', extras='url_sq, url_t',  page=page,min_taken_date=date, safe_search='3', per_page='50', count='49')
 
150
                                else:
 
151
                                        data_flickr = flickr.photos_getContactsPhotos(format='json', extras='url_sq, url_t',  page=page, safe_search='3', per_page='50', count='49')
146
152
                        else:
147
153
                                if date:
148
154
                                        data_flickr = flickr.photos_recentlyUpdated(format='json', extras='url_sq, url_t',min_date=date,  page=page, safe_search='3', per_page='50')
152
158
                data_flickr = data_flickr.strip('jsonFlickrApi(').strip(')')
153
159
                data_flickr = simplejson.loads(data_flickr)
154
160
                data_list = []
 
161
                print data_flickr
155
162
                if data_flickr:
156
163
                        for i in data_flickr['photos']['photo']:
157
164
                                item_list = []