Reverse Pull Request#19

Open

iamrobinhood12345 wants to merge 105 commits into

startfrom

Commits on Jan 9, 2017

layout and result templates. routes.
Your Name
committed
Merge pull request #1 from Pysearch/templates
iamrobinhood12345
authored
temp commit to switch to new branch.

William Benjamin Shields
authored and
William Benjamin Shields
committed
home view template added. modifed layout template.
Your Name
committed
Merge branch 'master' of https://github.com/Pysearch/Pysearch2.0 into templates
Your Name
committed
Merge branch 'views' of https://github.com/Pysearch/Pysearch2.0 into templates
Your Name
committed

Commits on Jan 10, 2017

created dummy db in default, tested basic app. links/routes working
Your Name
committed
spiders integrated into app
midfies
committed
rge branch 'harvester' of https://github.com/Pysearch/Pysearch2.0 into development

William Benjamin Shields
authored and
William Benjamin Shields
committed
posgres
Your Name
committed
scrapy pipeline updated to update db
midfies
committed
adding file that tests harvester from scripts dir
midfies
committed
Merge pull request #4 from Pysearch/harvester
iamrobinhood12345
authored
Merge branch 'development' of https://github.com/Pysearch/Pysearch2.0 into development

William Benjamin Shields
authored and
William Benjamin Shields
committed
base.metadata.drop_all(engine) in create_keyword_table in pipelines.py.

William Benjamin Shields
authored and
William Benjamin Shields
committed
psycopg2 and stop-words added to requires in setup.py.

William Benjamin Shields
authored and
William Benjamin Shields
committed
moved test harv functionality into homeview.

William Benjamin Shields
authored and
William Benjamin Shields
committed
added route for computing results, added view for computing results, added template for computing results.

William Benjamin Shields
authored and
William Benjamin Shields
committed
templates and dummy data updated
Your Name
committed
merge conflict resolved, views/default.py, setup.py.

William Benjamin Shields
authored and
William Benjamin Shields
committed
update dummy data for pserve
Your Name
committed
resolve stop_words to stop-words in requires in setup.py.

William Benjamin Shields
authored and
William Benjamin Shields
committed
basic crawler spider
midfies
committed
commiting to pull in changes from crawler.

William Benjamin Shields
authored and
William Benjamin Shields
committed
edited template for results, edited views results list of dicts, added temp test_harv.py.

William Benjamin Shields
authored and
William Benjamin Shields
committed
adjusted development.ini for my postgres username (ben), modified initializedb.py to drop all on init and input Keyword models, adjusted views/default.py to return results from postgres pysearch da…

William Benjamin Shields
authored and
William Benjamin Shields
committed
working on crawler spider and multiple pipelines
midfies
committed
pushing converted keyword model data to results.jinja2 in results_view in views/default.py.

William Benjamin Shields
authored and
William Benjamin Shields
committed
modified home.jinja2 search to have form with method post.

William Benjamin Shields
authored and
William Benjamin Shields
committed
moved results test param and edited home_view print statement in default.py.

William Benjamin Shields
authored and
William Benjamin Shields
committed

Commits on Jan 11, 2017

crawling pipeline added, FIRST WORKING SEARCH ENGINE
midfies
committed
removing corpse code and print statements
midfies
committed
added passing url through harvest function
midfies
committed
edited harvester process to take HarvestSpider as arg (instead of harvester). imported sys for secondary arg in test_harv.py. added command to call harvester and send url to harvester.

William Benjamin Shields
authored and
William Benjamin Shields
committed
merge conflict resolved.

William Benjamin Shields
authored and
William Benjamin Shields
committed
debugging critical: unhandled error in deferred.

William Benjamin Shields
authored and
William Benjamin Shields
committed
shortened time delay to five seconds in home_view.

William Benjamin Shields
authored and
William Benjamin Shields
committed
debugging views.

William Benjamin Shields
authored and
William Benjamin Shields
committed
placed class HarvestSpider within def harvest(url) in harvester.py. set up default.py home_view to call subprocess harvester.py directly (name == main uncommented in harvester.py). commented out te…

William Benjamin Shields
authored and
William Benjamin Shields
committed
commented out print statements.

William Benjamin Shields
authored and
William Benjamin Shields
committed
added drop all tables for running harvester
midfies
committed
debugging critical error db population.

William Benjamin Shields
authored and
William Benjamin Shields
committed
working on integration
midfies
committed
moved pipeline functionality to spider
midfies
committed
merging views to dev-branch
midfies
committed
first functioning harvester/crawler
midfies
committed
removed beautifulsoup from setup, added requirements.txt
midfies
committed
added Procfile
midfies
committed
added run
midfies
committed
added runapp.py
midfies
committed

Commits on Jan 12, 2017

Commits on Jan 13, 2017

some front end magic
midfies
committed
added about me route and view
midfies
committed
adjusting for no results
midfies
committed
Merge pull request #14 from Pysearch/integration-thursday
midfies
authored
add about me template
midfies
committed
Merge pull request #15 from Pysearch/integration-thursday
midfies
authored
Merge pull request #16 from Pysearch/dev-branch
midfies
authored
role midfies management.

William Benjamin Shields
authored and
William Benjamin Shields
committed
adding new tests
midfies
committed
adding tox
midfies
committed
about me
Your Name
committed
Merge pull request #18 from Pysearch/final-testing
iamrobinhood12345
authored
prepping master for presentation.

William Benjamin Shields
authored and
William Benjamin Shields
committed
cleaned up test page, corpse code and docstrings.

William Benjamin Shields
authored and
William Benjamin Shields
committed
docstrings and readme in harvester directory.

William Benjamin Shields
authored and
William Benjamin Shields
committed
model docstrings.

William Benjamin Shields
authored and
William Benjamin Shields
committed
cleaning css, removed files, cleaned initializedb.py, renamed css files.

William Benjamin Shields
authored and
William Benjamin Shields
committed
modifying templates, deleting unused templates, updating about me, pysearch description.

William Benjamin Shields
authored and
William Benjamin Shields
committed
debugged results page seed page search.

William Benjamin Shields
authored and
William Benjamin Shields
committed

Commits on Jan 23, 2017