Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge the active develop branch back into master #136

Merged
merged 346 commits into from
Sep 16, 2016
Merged

Merge the active develop branch back into master #136

merged 346 commits into from
Sep 16, 2016

Conversation

tucotuco
Copy link
Member

No description provided.

eightysteele and others added 30 commits February 27, 2013 13:30
@eightysteele
fix project.clj :excludes on org.slf4j
3520270
@eightysteele
add json to project.clj dep
1ba6010
@eightysteele
cleanup ipt namespace, add docs
a27d6aa
@eightysteele
leetle more cleanup
0352bc6
@eightysteele
add xml->json java stuff
2a192ab
@robinkraft
Updated deps
44115fe
@robinkraft
Added functions and queries to facilitate resource synchronization
4f2bd90
@eightysteele
Merge pull request #41 from VertNet/feature/resource-sync
a1d1ea0 
WIP: Added functions and queries to facilitate resource synchronization
@eightysteele
Merge pull request #42 from VertNet/feature/harvest
02d6e4c 
Time to upll feature/harvest into develop
@eightysteele
hotfix slf deps and gitignore
76b8c60
@eightysteele
fold sync queries into ResourceTable protocol.
c63a731
@eightysteele
fix resource map keywords
d1c3448
@eightysteele
cleanup
ff40da7
@eightysteele
harvest resource/org to cdb
c3b2dff
@eightysteele
sinking records to pail
028d910
@eightysteele
sink data and metadata with test-data in ipt namespace
13556db
@robinkraft
First shot at stats queries
a6267f3
@robinkraft
Corrected handling of uniques; added queries for total-taxa stat
c5cb5e7
@robinkraft
Added collection and class queries
fdd66ef
@robinkraft
Merge pull request #45 from VertNet/feature/stats-queries
c95a484 
Added collection and class queries
@eightysteele
add Resource protocol
6f26b15
@eightysteele
Merge branch 'feature/sync' of github.com:VertNet/gulo into feature/sync
7bf887d
@robinkraft
Added docs
2a001cc
@robinkraft
Simplified thrift unpacking by using generic methods in helper functions
48b4693
@robinkraft
Added tests and future facts for views.clj
5cb0de2
@robinkraft
Test data is now bootstrapped before tests run
3bb366e
@robinkraft
Fixed formatting
2460b03
@robinkraft
Merge pull request #46 from VertNet/feature/stats-queries
ec160f7 
WIP stats queries and tests
@eightysteele
checkpoint commit
c25c7e0
@eightysteele
Merge branch 'feature/sync' of github.com:VertNet/gulo into feature/sync
5690294
tucotuco and others added 29 commits February 6, 2014 19:02
@tucotuco
Merge pull request #112 from VertNet/feature/truncate
bf7aec7 
Feature/truncate
@tucotuco
Removing spurious 7 from locationaccordingto field name.
c4f031b
@tucotuco
Cleaning up fields synchonized and fields in the harvest.
a8cd02e
@tucotuco
Adding migrator field to resource sync.
7a63d3e
@tucotuco
Typo.
0e0d5d3
@tucotuco
Merge pull request #120 from VertNet/feature/fieldcleanup
3a476a2 
Feature/fieldcleanup
@tucotuco
Attempt to pull some metadata from original source and some from Vert…
afc5599 
…Net-hosted version of resource.
@tucotuco
Merge pull request #121 from VertNet/feature/fieldcleanup
28213ad 
Attempt to pull some metadata from original source and some from VertNet...
@tucotuco
Adding GBIF dataset and publisher ids as well as license and lastinde…
13e995d 
…xed date to the harvest synchronization in CArtoDB.
@tucotuco
Correcting syntax errors.
a0cfa69
@tucotuco
Merge pull request #127 from VertNet/feature/syncupdate
b1b688f 
Feature/syncupdate
@robinkraft
Update to latest dwca-reader-clj with proper deps
3105713
@robinkraft
Merge branch 'develop' of github.com:VertNet/gulo into develop
7148432
@robinkraft
Bump version, dwca-reader-clj version
7da3078
@tucotuco
First attempt to harvest more metadata from CartoDB along with Darwin…
b5465e3 
… Core ratified in 2014.
@tucotuco
Merge branch 'develop' of https://github.com/VertNet/gulo into develop
99b5637
@tucotuco
Removed lastindexed from the set of harvested base fields.
ad290c6
@tucotuco
Amended the list of Darwin Core fields as given by the Darwin Core re…
aa4e91d 
…ader 1.20-SNAPSHOT.
@tucotuco
Further filtering harvest sync to include only resource_staging recor…
119018a 
…ds that have VertNet in the networks field.
@tucotuco
Ameding filter for VertNet in networks field.
dd284bd
@tucotuco
Report the resource title instead of resource record count (no longer…
eb57094 
… in output) when a resource is successfully doanloaded.
@tucotuco
Adding doi from CartoDB resource table to harvest fields.
53592ce
@tucotuco
Completing doi integration from CartoDB into harvest fields.
1c804ff
@tucotuco
Updated project file to use new clojars repo for dwca-reader.
b521741
@tucotuco
Correcting repo location for dwca-reader2-clj SNAPSHOT 0.20.
b74273e
Changed file and folder naming scheme to remove burdensome uuid. Patt…
9f84c56 
…ern written to GCS is now gs://vertnet-harvesting/data/YYYY-MM-DD/ICODE-resourceshortname/.
@tucotuco
Merge pull request #135 from VertNet/nouuid
3ab93a6 
Changed file and folder naming scheme to remove burdensome uuid. Patt…
Re-enabled record count display and cleaned up unnecessary sorting on…
b3c33a7 
… cartodbid for matching url as there can be only one.
@tucotuco
Just updating gitignore.
cf1813c
@tucotuco tucotuco merged commit 0122992 into master Sep 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@tucotuco @eightysteele @robinkraft