Commit Graph

1522 Commits (master)

Author SHA1 Message Date
eric ff38f063d0 update noftifications
needed a new way to populate the noticetype table because of signal
deprecation
2016-07-22 18:44:54 -04:00
eric 9da195dcc8 remove south, fix migration problems 2016-07-21 16:09:42 -04:00
eric f3cb6c9edf switch to contrib_comments
removed in 1.8
2016-07-21 16:05:57 -04:00
eric d8eb4297d9 migrations 2016-07-21 15:38:09 -04:00
Raymond Yee cf706a1203 Merge pull request #610 from Gluejar/bugfixes
3 Bugfixes
2016-07-19 10:18:20 -07:00
Raymond Yee 9e514c48e9 Merge pull request #609 from Gluejar/opds-indirect
implement indirectAcquisition element
2016-07-18 14:21:15 -07:00
Raymond Yee 4c395bbec4 Merge pull request #601 from Gluejar/fix-headings
fix headings like "!lcsh: whatever"
2016-07-18 13:16:14 -07:00
eric f110e02297 match licenses
noted that rights for gitenberg ebooks was not getting set properly
2016-07-14 19:02:22 -04:00
eric 3001aed8c8 implement indirectAcquisition element 2016-07-12 14:50:13 -04:00
Raymond Yee 4edd9127a8 hopefully, this will fix http://jenkins.unglueit.com/job/regluit/3708/console 2016-06-28 08:48:06 -07:00
eric c234b0ea45 management command
Management command to fix subject headings with yaml tags in the
heading name
2016-06-17 17:44:40 -04:00
Raymond Yee 251073b9a7 Merge pull request #595 from Gluejar/fix-push
mistake in error logging
2016-06-15 12:10:17 -10:00
Raymond Yee 5a22544d11 Merge pull request #592 from Gluejar/fix-preferred-edition
squash the missing edition problem
2016-06-15 11:13:22 -10:00
eric 2a505bc1cc mistake in error logging 2016-06-14 13:40:44 -04:00
eric a8a24c1208 add to test 2016-06-10 18:15:53 -04:00
eric c3057b6aef add code to deal with OBP, fix bugs. 2016-06-10 17:57:53 -04:00
eric 8cb502d5b9 squash the missing edition problem 2016-06-10 16:30:03 -04:00
eric 66bd4a043e add management command
this command already deployed; minimal testing required
2016-06-08 15:27:49 -04:00
Raymond Yee 9c59b701ed Merge pull request #587 from Gluejar/fix-survey-runinfo
Improve survey app
2016-05-31 16:13:34 -07:00
eshellman f99b621c19 Merge pull request #585 from Gluejar/push
FTP Push seconds on the onix file is a good idea
2016-05-30 10:30:34 -04:00
eric a40160f191 quick display and creation of landings 2016-05-26 12:19:33 -04:00
Raymond Yee 9364bd7a78 a bit more cleanup 2016-05-24 16:21:36 -07:00
Raymond Yee c39324831e get authors to match now once the utf8_general_ci collation we're using for authors taken into account. 2016-05-24 15:01:56 -07:00
Raymond Yee 7f9478e758 first pass at tests -- some cleanup needed 2016-05-23 17:03:55 -07:00
Raymond Yee 83756c5779 code in progress to test https://github.com/Gluejar/regluit/pull/584 2016-05-21 14:51:52 -07:00
eric bf220c5c6f Merge branch 'master' into push
# Conflicts:
#	settings/common.py
2016-05-20 16:44:13 -04:00
eric 11ea9b4d93 onix and cover improvements
onix recipients need both a pubdate and an isbn in the records.

the cover imagefiles from thumbnail occasionally result in broken
images- these are now detected.
2016-05-20 16:32:26 -04:00
eric cb3581e932 code for loading umich spreadsheet 2016-05-19 09:17:23 -04:00
eric 605d971078 prefer editions with covers 2016-05-18 13:52:33 -04:00
Raymond Yee 15888b8a76 fix regluit.core.tests.BookLoaderTests.test_add_by_local_yaml by adjust how ebook_name mocked 2016-05-16 15:11:03 -07:00
eric 30874ad832 handle toggling of active 2016-05-16 14:08:47 -07:00
eric 66ce157f97 large covers, archive 2016-05-16 16:47:58 -04:00
eric 66c0d84029 add work.formats() 2016-05-16 16:43:03 -04:00
Raymond Yee bf41bfccc6 change bookloader to load books by names of book in release and a command to deactivate currently broken ebooks 2016-05-16 12:43:11 -07:00
Raymond Yee 1b329f1b82 date for regluit.core.tests.CampaignTests.test_b2u needs to be kept within about 3 years of current date to pass 2016-05-16 08:18:42 -07:00
eric 4e8a834d02 fix test 2016-05-12 12:56:25 -04:00
eric 5eb7ec366a add OSI license catch-all
for BSD, MIT, and other OSI approved licenses
2016-05-12 11:00:52 -04:00
Raymond Yee cc9b4ed7c0 Merge pull request #568 from Gluejar/really-delete-ebook-files
delete files when deleting ebookfiles
2016-05-10 17:46:31 -07:00
eric f662920c2a Merge branch 'master' into push 2016-05-10 17:33:54 -04:00
eric 50930ce2b1 send kindle from s3
add file archiving code, because we needed it for push distribution.

Also use archive for kindle. tweak send-to-kindle docs.
2016-05-09 18:32:38 -04:00
eric ee0d19810c delete files when deleting ebookfiles
apparently the behavior changed after django 1.2. Anyway, we should
delete files from s3 before we delete the referring object
2016-05-06 15:28:19 -04:00
Raymond Yee ba516cd08d Merge branch 'master' into dj16 2016-05-04 13:52:25 -07:00
Raymond Yee 7ec9a98206 separate out failing test 2016-04-29 08:55:12 -07:00
eric 730c46c02a Merge branch 'master' into dj16 2016-04-27 12:03:41 -04:00
eric 9c6ff70e65 add comments 2016-04-24 10:34:13 -04:00
eric c5886e5584 allow thanks campaign after success 2016-04-23 17:55:01 -04:00
Raymond Yee db0ab1ac39 accidental extra characters 2016-04-21 13:39:28 -07:00
Raymond Yee 0f31a617c5 fix missing comma 2016-04-21 13:37:59 -07:00
eric a4d0b2d172 no, don't deactivate other ebooks 2016-04-21 14:44:50 -04:00
eric b47d166eda 1.6 transaction sideeffect 2016-04-09 13:24:44 -04:00
eric 2b9fd4e021 undo deletion of "edition.unglued" 2016-04-09 13:23:36 -04:00
eric bca17837a0 add fixtures in testcases 2016-04-09 13:21:12 -04:00
eric a4e9855b35 revert to older, patched Notification 2016-04-08 18:45:50 -04:00
eric 14829c327a misc fixes for 1.6 2016-04-08 18:12:10 -04:00
eric 562be5f12d patch django-notification 2016-04-07 20:37:54 -04:00
Raymond Yee 182e784144 add a comment to clarify distinction betwen Ebookfile and Ebook 2016-03-30 14:59:04 -07:00
eric a72ac07dcf add function to generate mobi from the active epub 2016-03-29 13:06:23 -04:00
eric c902d6503c can add asks to non-ebf ebooks
(and can start a thanks campaign with non-ebf ebooks
2016-03-28 17:53:33 -04:00
eric 7180661fe3 generate mobi on ask 2016-03-28 14:30:05 -04:00
eric ab0c8814b4 add management command 2016-03-25 23:44:18 -04:00
Raymond Yee 7bd29807f6 fix problem with Obama book in Chinese 2016-03-25 15:07:31 -07:00
Raymond Yee bf914a53de make use of settings.CONTENT_TYPES to compute EBOOK_FORMATS 2016-03-07 13:30:40 -08:00
Raymond Yee c5b7c20593 mock_ebook -> test_mode (much clearer) 2016-03-07 13:17:33 -08:00
Raymond Yee abe04a02c7 * Modified core.bookloader.load_from_yaml to go from assuming that there is an epub to enumerating
ebooks from corresponding release specified in yaml_url

* add GitHubTests.test_ebooks_in_github_release

* modified bookloader.load_from_yaml to allow for mock loading of epub in core.tests.BookLoaderTests.test_add_by_local_yaml
2016-03-04 12:09:30 -08:00
Raymond Yee 1ab3711bbf placeholder for updating load_from_yaml to handle formats other than epub -- e.g., mobi, pdf 2016-03-03 09:49:48 -08:00
Raymond Yee f9320c6279 recognize that get_or_create returns (ebook, created) in load_from_yaml 2016-02-10 16:23:58 -08:00
Raymond Yee 45cb7d4eac [#113378215] prevent a duplicate ebooks with exact same metadata from being created by /api/loader/yaml
add dedupe_ebooks_with_same_urls.py command for deleting duplicate ebooks
2016-02-10 11:04:06 -08:00
eric a575de59b6 make pubname and authname unique 2016-01-25 14:08:37 -05:00
eric 2b100ece61 fix pub_id not integet 2016-01-25 13:29:18 -05:00
Raymond Yee bf8e385cb1 Merge pull request #545 from Gluejar/improve-opds
Improve opds
2016-01-20 17:19:31 -08:00
eric 51f5ac990b fix test 2016-01-19 20:53:55 -05:00
eric f33cd6e487 revamp sitemap priority, add to opds 2016-01-19 17:28:45 -05:00
eric 561ae6b94a handle the exception 2016-01-18 10:13:43 -05:00
eric 4dc4e2d898 add test to reproduce duplicate pubname
Unglue.it error on January 11, 2016 at 5:02 AM:
Traceback (most recent call last):

 File
"/opt/regluit/ENV/local/lib/python2.7/site-packages/django/core/handlers
/base.py", line 109, in get_response
   response = callback(request, *callback_args, **callback_kwargs)

 File "/opt/regluit/frontend/views.py", line 795, in googlebooks
   edition = bookloader.add_by_googlebooks_id(googlebooks_id)

 File "/opt/regluit/core/bookloader.py", line 343, in
add_by_googlebooks_id
   e.set_publisher(d.get('publisher'))

 File "/opt/regluit/core/models.py", line 1827, in set_publisher
   pub_name = PublisherName.objects.get(name=publisher_name)

 File
"/opt/regluit/ENV/local/lib/python2.7/site-packages/django/db/models/man
ager.py", line 131, in get
   return self.get_query_set().get(*args, **kwargs)

 File
"/opt/regluit/ENV/local/lib/python2.7/site-packages/django/db/models/que
ry.py", line 368, in get
   % (self.model._meta.object_name, num, kwargs))

MultipleObjectsReturned: get() returned more than one PublisherName --
it returned 2! Lookup parameters were {'name': u'North-Holland'}
2016-01-18 10:08:58 -05:00
eric 3d3a90941a switch to obscure book for tests 2016-01-18 09:59:52 -05:00
Raymond Yee bac02db88a Merge pull request #540 from Gluejar/missing-work-title
fixed work title in templates
2015-12-19 15:32:17 -05:00
Raymond Yee c662da6a32 Merge pull request #538 from Gluejar/fix-merge-ui
Fix merge ui
2015-12-19 15:04:09 -05:00
Raymond Yee 65b0ded78b fix failing http://jenkins.unglueit.com/view/All/job/regluit/3436/console -- Google books api data change 2015-12-19 14:10:51 -05:00
eric ff5263c185 fix at the core 2015-12-18 14:28:49 -05:00
eric a35c39b96f supply a value for the work selectable
fixes a problem, but I'm mystified why this problem appeared. perhaps
we redefined work.__unicode__() ?
2015-12-14 12:03:38 -05:00
Raymond Yee 5544aeb70c Merge pull request #531 from Gluejar/pubdate-range
Pubdate range
2015-11-17 13:56:59 -08:00
Raymond Yee d417eeec2d Re [#108339512] (https://www.pivotaltracker.com/story/show/108339512) -- for now
just mark the failing Google Books API tests as expected failures.
2015-11-17 08:00:08 -08:00
eric 7b7d7cf174 Merge branch 'master' into pubdate-range 2015-11-16 11:06:21 -05:00
Raymond Yee 2a07aa32dc Merge pull request #526 from Gluejar/edition_loader
Edition loader
2015-10-07 14:36:14 -07:00
Raymond Yee 27d4a354db Merge pull request #527 from Gluejar/repair-relation-migration
fix relator model
2015-10-07 14:17:27 -07:00
Raymond Yee 271663054c Merge pull request #525 from Gluejar/bisac-tree
Bisac headings in edition edit
2015-10-07 11:14:34 -07:00
eric 1ccdc144ba display publication range
needs a migration
2015-10-05 19:17:16 -04:00
eric 841bcb66ec fix relator model
this error was causing subsequent core migrations to fail
2015-10-05 17:17:53 -04:00
eric a74a2c47b2 now handles loading multiple editions 2015-09-24 17:58:34 -04:00
eric a3a1a72b46 add management command to convert ungluit subjects to bisac 2015-09-21 21:04:11 -04:00
eric d69921c109 loader now aware that agent_name is reversed 2015-09-12 19:20:08 -04:00
eric 2aa49e8d15 bug fixes and api cleanup 2015-08-27 15:23:25 -04:00
eric 0ae55a3bfa add edition level filter 2015-08-27 15:22:21 -04:00
Raymond Yee 40cdd1b141 Merge pull request #515 from Gluejar/recover-edition
fix occasional bug
2015-08-24 20:50:14 -07:00
eric 1833318c2d fix occasional bug 2015-08-22 14:29:35 -04:00
eric 16cc217f2b test ridiculously long 2015-08-21 18:31:52 -04:00
eric fa440d7935 wrong code for gutenberg id 2015-08-21 18:13:50 -04:00
eric 6bba8b0ef6 reduce load on converter 2015-08-21 18:09:35 -04:00
eric c34ffdd883 implement sorel-thumbnail
uses thumbnail for all non-google covers
2015-08-21 17:54:39 -04:00
eric 86ef74662b add author role selector
Previously, to change an author role, you had to delete and add the
author.
2015-08-21 13:47:04 -04:00
eric 4244a5fb98 fix tests 2015-08-18 14:34:52 -04:00
eric 779ba45d97 don't add v to version string
don't load ebook if version string starts with 0.0.
add test with local version
2015-08-18 06:57:14 -04:00
eric 42c66c29b6 fix rights lookup
also sync cc.py in core with cc.py in gitenberg metadata. Will DRY
later.
2015-08-07 01:21:15 -04:00
eric 11cf5b2869 Merge branch 'master' into publisher-opds
Conflicts:
	api/urls.py
2015-08-06 13:39:16 -04:00
Raymond Yee 749420eb30 Merge pull request #502 from Gluejar/load_from_yaml
Load from yaml
2015-08-06 10:28:23 -07:00
eric 6184b32b4d missing relator case 2015-08-04 12:58:48 -04:00
eric cc21ac2edb add publisher feed
but don't expose it
2015-08-03 16:58:02 -04:00
eric a469b025d3 add filter for ebooks
so only pdf ebooks are shown in pdf feeds, only CC-BY ebooks are shown
in  CC BY feeds
2015-08-03 16:22:40 -04:00
eric f79daf09db use gitenberg.metadata 2015-08-03 10:04:07 -04:00
eric c9ae756743 add url to loaded ids 2015-07-31 16:34:47 -04:00
eric 7932e047d7 basic api wiring 2015-07-30 00:34:05 -04:00
eric 098eddc327 work in progress 2015-07-29 23:01:43 -04:00
eric 5185410825 get tests to pass 2015-07-28 09:41:55 -04:00
eric 1462d9e04d tweaks 2015-07-28 01:29:55 -04:00
eric 44cd1eb19b add relation support to edition edit 2015-07-28 00:52:21 -04:00
eric 7c31bb115e fix authors.remove 2015-07-27 23:44:34 -04:00
eric e386dccb49 show non-author relations 2015-07-27 23:21:11 -04:00
eric 088bdff782 fix add_author 2015-07-27 23:20:30 -04:00
eric 50429e4f1b migrate model
add through relation to authors
add authority code to subjects
2015-07-27 16:22:04 -04:00
Raymond Yee 7b3360b235 Merge pull request #497 from Gluejar/catch_stk_timeouts
move mock ebook class to acq
2015-07-09 14:09:24 -07:00
eric 449f38fe7d move mock ebook class to acq 2015-07-09 15:08:16 -04:00
Raymond Yee 153a582cf0 Merge pull request #484 from Gluejar/add_yahoo
Add yahoo sign-in
2015-06-17 16:39:47 -07:00
Raymond Yee 3b575d10f6 changed default python social auth exception handling to catch the exception and send backend/error message to error page.
I've decided to display the backend but not the error message.
2015-06-17 15:39:27 -07:00
Raymond Yee bb74261013 sample book (temporarily) not recognized by Google Books API 2015-05-27 12:37:47 -07:00
eric 8d53a016f9 update facebook picture 2015-04-17 11:46:29 -04:00
eric f340826276 fb id to bigint 2015-04-16 23:20:29 -04:00
eric 7715551671 fix auth pipeline classes 2015-04-15 10:50:36 -04:00
eric 4944df8e78 error introduced by a comment 2015-04-10 15:10:55 -04:00
eric dab8954388 this is why we have tests 2015-04-09 13:12:22 -04:00
eric 97579bda71 re-establish un length limit 2015-04-09 12:41:00 -04:00
eric a8cab6c0ae get google oauth2 working 2015-04-07 22:55:30 -04:00
Raymond Yee 53a37b1b31 Merge branch 'master' into mobigen_integrate 2015-04-03 10:05:02 -07:00
eric 1739e94177 returned gbooks thumbnail urls have changed 2015-03-18 14:59:38 -04:00
Raymond Yee b0550999e1 incorporate changes from kindle safe title changes.
Merge branch 'master' into kindle_file_size

Conflicts:
	frontend/views.py
2015-03-09 10:56:20 -07:00
Raymond Yee 71c8a95b90 add comment about what fix_kindle_bugs does 2015-03-06 15:16:04 -08:00
eric 0c4550fe4a save ebook file size on send_to_kindle
don't deal with booxtream (b2u) ebooks at a all, only deal with free
ebooks
2015-03-05 22:30:03 -05:00
eric f05b276118 provide a title that's kindle-safe 2015-03-03 17:39:23 -05:00
Raymond Yee 9c4d609579 Merge pull request #459 from Gluejar/download-nits
add inactive download counts in rh tools [fix #88928040]
2015-02-25 11:21:08 -08:00
eric 84227748db add inactive download counts in rh tools 2015-02-23 16:52:55 -05:00
eric 53ecbfcb5f DRY for safe_get_work 2015-02-18 12:47:19 -05:00
Raymond Yee a9d4a71912 fixed an incorrect reference, uncovered by the tests! 2015-02-03 15:41:38 -08:00
Raymond Yee edd65c08c3 make sure the campaigns for the editions returned by editions_to_convert are not b2u. 2015-02-02 15:05:36 -08:00
eric 53b62642cd more idiomatic increment 2015-02-02 13:31:10 -05:00
eric c714de0d67 also for doab records 2015-01-30 11:39:48 -05:00
eric 7cb0f473de remove many-commas subjects, prevent their addition 2015-01-30 11:33:22 -05:00
Raymond Yee 32ec6b0a03 Merge pull request #449 from Gluejar/improve_gifts
Improve gifts
2015-01-28 11:59:27 -08:00
Raymond Yee 0b7f522232 first pass at a command to convert all the convertible campaign ebooks to mobi 2015-01-26 12:19:26 -08:00
Raymond Yee dfbdf9bbd7 add a test for mobigen 2015-01-26 09:48:16 -08:00
Raymond Yee e9d8080c3b First cut of celery tasks for converting to mobi 2015-01-23 15:52:35 -08:00
Raymond Yee 6c1630905b Merge branch 'master' into mobigen_integrate 2015-01-23 10:43:33 -08:00
eric ea5adba871 add notifications for unredeemed gifts 2015-01-23 13:11:19 -05:00
Raymond Yee 61c0de3fbc add a command to delete subjects with non-xml characters 2015-01-22 15:48:04 -08:00
Raymond Yee b4776f36e2 Merge branch 'master' into mobigen_integrate 2015-01-20 13:13:58 -08:00
eric aa14bcb5c9 fix github matcher 2015-01-19 12:10:07 -05:00
Raymond Yee 1be246586c Merge pull request #443 from Gluejar/edit_kw
Edit kw
2015-01-16 09:17:11 -08:00
eric 154701bea5 show most common keywords first 2015-01-16 08:56:36 -05:00
Raymond Yee 50fae7d544 Running into validation problems with OPDS because "image/image" mime-type for
urls like https://github.com/Gluejar/open_access_ebooks_ebook/blob/master/open_access_ebooks/EPUB/cover.120.jpg?raw=true

Fix by looking at the ending of the path of a url, not the fragement, parameter, or query string
2015-01-14 18:29:17 -08:00
eric 4f0cc87b48 temp add kw 2015-01-14 15:07:54 -05:00
eric ea4e489213 fix the odds implementation of kw facet
mostly, fixing missing url encoding
2015-01-12 12:03:47 -05:00
Raymond Yee 134988f082 modify migration to handle situation in which a subject does not exist (e.g., Selenium tests) 2015-01-11 12:44:31 -08:00
Raymond Yee 684c518324 add comments to clarify intention of parts of facets.py, based on Eric's answers to Raymond's questions 2015-01-11 12:18:30 -08:00
eric 62daa67880 coming together! (needs migration) 2015-01-09 17:05:34 -05:00
Raymond Yee f08c721d2e Merge pull request #434 from Gluejar/give_btu
Give btu updates: gift table revamp, add gift admin
2014-12-22 15:31:50 -05:00
eric 5e4b7a7b89 fix wrong field type in model 2014-12-22 13:49:39 -05:00
eric 6fc3eb8703 turns out we can't send notifications to inactive accounts
I had intended that gift redemption would activate the account, but
that doesn't work. Need to figure out the downside to having unverified
active accounts.
2014-12-22 13:24:22 -05:00
Raymond Yee 642653c4f8 Merge pull request #433 from Gluejar/give_btu
bug fix in give_btu
2014-12-22 11:50:18 -05:00
eric c85fd340d8 how did that sneak through? 2014-12-22 11:47:34 -05:00
Raymond Yee 05686ffaec Merge pull request #432 from Gluejar/give_btu
Give btu updates
2014-12-22 09:04:08 -05:00
eric ae208286f0 handle case of double gifts
also make gift redemption experience uniform
2014-12-21 16:02:02 -05:00
Raymond Yee 20c3ffe12e Merge pull request #430 from Gluejar/give_btu
As requested by Eric, I'm now going to do the merge to get this PR on just.  Then I'll test downloads.  Noting the current commit on master in case we need to revert: 25dcb06f46
2014-12-20 15:42:00 -05:00
eric 5719f7f90c forgot to actually test the code 2014-12-20 13:14:05 -05:00
eric b01562b630 Properly handle gifts to existing users 2014-12-20 12:47:15 -05:00
eric f18acfc091 notify the giver when the gift is redeemed
migration needed
2014-12-19 15:13:54 -05:00
eric 2c44a29aa7 regifting 2014-12-18 13:37:28 -05:00
eric 1c651f2458 everything more or less works except resifting 2014-12-18 01:07:59 -05:00
eric 41163d81a2 purchase and provisioning the gift 2014-12-16 14:18:51 -05:00
Raymond Yee b9aee9095b Merge branch 'master' into mobigen_integrate 2014-12-16 08:55:51 -08:00
Raymond Yee ac39075ccd a comment to explain logic of reset_free_flag 2014-12-15 11:46:59 -08:00
eric 7b5174aca6 ui and model for buy as a gift 2014-12-15 00:56:08 -05:00
eric be0ab46872 use is_free in query sets 2014-12-14 10:00:10 -05:00
eric b54b21fdfe keep is_free up to date 2014-12-13 12:37:35 -05:00
eric c9270b154a Merge branch 'master' into free_flag 2014-12-13 11:55:02 -05:00
Raymond Yee 19dd7eadcb Merge pull request #425 from Gluejar/opds_facets
Opds facets [deliver #82001456]
2014-12-12 11:42:04 -08:00
eric 7ceaffd124 add is_free flag 2014-12-11 23:01:13 -05:00
Raymond Yee 6c824e38af Added another clarifying comment 2014-12-11 14:34:04 -08:00
Raymond Yee f24478d641 Add a comment to explain logic KeywordFacetGroup.has_facet in response to explanation in https://github.com/Gluejar/regluit/pull/427#discussion_r21712785 2014-12-11 14:08:19 -08:00
eric 8c9bccc1f0 keyword facets!
for example, /free/kw.Fiction/
2014-12-10 17:14:28 -05:00
Raymond Yee 5995ae610a Moved code to call the mobigen service from .ipynb to regluit.core.mobigen (may eventually want to move core/mobigen.py to external package) 2014-12-09 11:56:27 -08:00
Raymond Yee e76b1feccc Merge branch 'master' into opds_facets 2014-12-08 16:06:44 -08:00
Raymond Yee f7b796c6a6 Merge pull request #421 from Gluejar/facets
Facets [deliver #70680500]
2014-12-08 15:21:49 -08:00
Raymond Yee 95958847ed Since http://jenkins.unglueit.com/job/regluit/2912/console, the cover images from Google Books api are now starting with http and not https, which is strange.
This fix allows the test to pass for http or https book covers
2014-12-08 10:09:05 -08:00
eric badf8e4b0e bring back descriptions, use them 2014-12-05 20:38:08 -05:00
eric ab6eb0eed5 revise the top level feeds 2014-12-05 20:37:51 -05:00
eric 5246bd1a1c add new facet machinery to olds 2014-12-05 18:38:04 -05:00
eric 70d4506365 move path parsing to facets 2014-12-05 18:36:45 -05:00
eric f689bcf6bd I learned something 2014-12-05 09:39:48 -05:00
Raymond Yee 0e3b0468c3 rewrite some classes in facets.py to use instance variables instead of class variables...will matter if we have more than one Facet/FacetGroup at a time 2014-12-04 14:40:30 -08:00
eric 08408dae79 adjust display for ebook rights form 2014-12-03 13:25:01 -05:00
eric 75fab489f1 fix display of license url, title and labels 2014-12-03 13:18:29 -05:00
eric a285b94ddd make spelling consistent 2014-12-03 13:17:43 -05:00
eric af83e6a8c0 Rip out CCList, replace with facets 2014-12-03 10:15:38 -05:00
eric 8e23f937f8 auto generate refine box 2014-12-02 16:09:30 -05:00
eric 533922de9f buggy image 2014-12-01 16:14:38 -05:00
eric eefcee6f32 Merge branch 'master' into facets 2014-12-01 16:08:12 -05:00
eric 7913b7e38c wired license facet block 2014-12-01 16:07:41 -05:00
eric a7c9c5a6d7 add license art libre
Also fixed a mistake that left gfdl off of the ebook choices list.
correct spelling is "license art libre"
2014-11-23 16:44:59 -05:00
eric 2264926301 Merge branch 'master' into facets 2014-11-20 22:12:18 -05:00
eric c87004122d add GDFL to campaign choices
needed for framasoft translation of a Stallman book
2014-11-20 21:34:19 -05:00
eric 20cf22da8f add facet descriptions. 2014-11-20 21:11:15 -05:00
eric 5dd1d836fb add sorting 2014-11-18 16:54:19 -05:00
eric 9aa6d0c78c Merge branch 'master' into facets 2014-11-18 13:33:51 -05:00
eric 591f06a267 first pass at faceted search 2014-11-18 13:33:17 -05:00
eric b7aaa155a0 sloppy error 2014-11-17 13:30:02 -05:00
eric 7e1c5eeec9 add github and wikibooks to allowed ebook sources 2014-11-17 11:51:36 -05:00
Raymond Yee db969f859d Merge pull request #412 from Gluejar/privacy
I will do the merge to test the dropbox functionality on just.
2014-11-14 14:43:27 -08:00
eric 3d71917d70 self-host license badges 2014-11-10 13:14:59 -05:00
eric 547adfea56 Change default avatar to one with more privacy
using a user's email in the gravatar hash can connect their account to
other sites. Stop doing this as default for new users.
2014-11-07 14:47:12 -05:00
Raymond Yee b08cdbf2bc Merge pull request #410 from Gluejar/load_marc
Load marc
2014-11-06 17:52:14 -08:00
Raymond Yee bad86da003 Merge pull request #409 from Gluejar/opds_paging
[finish #78017168] Opds paging
2014-11-06 16:54:52 -08:00
eric 4b250ec9d8 this allows admin to edit a work without featuring it 2014-11-06 14:23:34 -05:00
eric 4e4d1debd0 fix bug in isbn module 2014-11-05 18:33:30 -05:00
eric df913fab09 some feed consumers want images for both sizes 2014-11-03 19:57:58 -05:00
eric e41dd676c8 add stub record indicator 2014-11-03 16:29:36 -05:00
eric aeb07049da delete core.marcrecord table 2014-11-03 14:52:43 -05:00
eric fafd37a973 Merge branch 'master' into marc_package
Conflicts:
	core/marc.py
	static/css/campaign2.css
2014-10-30 12:38:53 -04:00
eric c5bb7220f2 don't link cover to google books if own cover 2014-10-29 15:18:32 -04:00
eric d0e305cfec rip out code 2014-10-27 19:11:44 -04:00
eric 3b4b836e6c add marc download tools 2014-10-27 11:55:46 -04:00
Raymond Yee 98b5af63cc a proposed fix for when edition.publisher_name is None 2014-10-25 17:43:15 -07:00
eric 96a94378a2 on-line fix 2014-10-25 12:02:27 -04:00
Raymond Yee 78ddf22c18 Merge branch 'master' into stub-marc 2014-10-22 02:04:00 +00:00
eric 73003ba1c2 stub loader 2014-10-20 16:57:20 -04:00
eric a5d3dfdf4f add_author method 2014-10-20 16:54:19 -04:00
eric 9de0474386 start moving marc code to its own package 2014-10-17 17:14:02 -04:00
eric be294aa8f0 Merge branch 'master' into stub-marc 2014-10-17 11:36:35 -04:00
eric 3e21430e13 # in MARC spec means blank space 2014-10-17 11:30:55 -04:00
eric a085a5fcca add more metadata from db
008, authors, publishers, isbn, pub date from db
2014-10-16 17:14:54 -04:00
Raymond Yee 1dd114bc74 add to migration the change in default collation for core_identifier. One possible problem is that this code is mysql specific. In practice, not a problem for now since we're using mysql. 2014-10-15 07:46:50 -07:00
eric d8d97faee2 change size of value column
This migration will throw an error unless the entire table has
collation utf8_bin because of the unique together constraint. Also, 250
is the largest size we can have with mySQL as back end (together with
the unique together index)
2014-10-14 15:42:57 -04:00
eric fbe96bcfc7 basic stub records 2014-10-14 10:08:08 -04:00
eric 93c9b696b2 Allow staff to enter books with an http id
I'm finding LOTS of books that don't have ISBN or OCLCnum
2014-10-08 16:23:24 -04:00
eric ef6c4a659e ebook files activate and deactivate
when manager unselects 'add_ask', the system didn't revert to the files
without added ask. This fixes that. To test, toggle the add_ask
checkbox and save campaign.
2014-10-04 16:51:16 -04:00
eshellman 2223446f36 Merge pull request #386 from Gluejar/pdf_ask
Insert Pdf/epub ask into served files [Take 2]
2014-09-17 04:48:46 -04:00
eric 6c9f4459b3 only set LC as source if LC is source 2014-09-12 17:44:41 -04:00
Raymond Yee 2651e79a3c syntax error 2014-09-12 14:37:22 -07:00
eric 8423e5442b fixed error when record is not from LC 2014-09-12 11:49:07 -04:00
eric 28434b06a1 now do the same for epubs 2014-09-05 16:35:57 -04:00
eric 6bccb4b3f8 bugfix 2014-09-05 13:30:09 -04:00
eric 30e50260a3 make ebooks when new files are uploaded, clean up old
the download bits are suppressed when the ask comes from the pdf
seems we weren't making new ebooks when new files were uploaded
old ebooks now deactivated so we don't loase download counts and history
add ask to pdf is triggered by file upload or THANKS campaign save
2014-09-04 18:33:20 -04:00
eric 7c88bf107f typo 2014-08-30 13:31:12 -04:00
eric 40831b6161 incorporate add_ask into campaign management 2014-08-30 12:04:50 -04:00
eric 73c616092d campaign.add_ask_to_ebfs for pdfs 2014-08-28 15:29:41 -04:00
Raymond Yee 7b7c050fb2 Merge pull request #379 from Gluejar/edition_errata
Edition editing errata
2014-08-13 22:30:49 -07:00
Raymond Yee edb769317d Merge pull request #375 from Gluejar/new_campaign_options
no contrib form if the ask is all zero
2014-08-07 15:58:22 -07:00
eric 5a2a3e60b6 add PD and GDFL to license choices; add pd-us
also all make list display facets for PD-US and GDFL; don't expose them
until we have content we like in them
2014-08-06 17:14:09 -04:00
eric a08fc4441c eliminate spurious ids for un-saved editions 2014-08-06 16:18:00 -04:00
eric af3ea58b7b examined order_by queries, added indices as required 2014-07-31 12:17:42 -04:00
eric 833654d89f update launch able to reflect no-ask campaigns 2014-07-29 22:43:37 -04:00
Raymond Yee 440b352fff Set publisher name for edition 2014-07-25 15:16:06 -07:00
Raymond Yee 307db5a995 Merge branch 'master' into doab_load 2014-07-25 14:45:22 -07:00
eric aa84366418 no contrib form if the ask is all zero 2014-07-25 14:43:54 -04:00
Raymond Yee 967bd2dcae code can now load description, subjects and covers for the pdf files 2014-07-24 16:29:28 -07:00
Raymond Yee 45a89ee055 Merge branch 'master' into doab_load 2014-07-22 15:36:40 -07:00
eric 6aa3e458ea move opds to api
and simplify code.
view no longer passing site and protocol to opds methods
facets now in a list
url adds /api/ in front
2014-07-16 16:47:32 -07:00
Raymond Yee 7f02fcd126 The doab_load_books django command is working again -- I had to fix the signatures of some methods 2014-07-16 15:26:19 -07:00
Raymond Yee 806e24dc80 Merge pull request #367 from Gluejar/OPDS
Opds
2014-07-11 14:13:13 -07:00
Raymond Yee 7df31ee53d Merge branch 'master' into doab_load 2014-07-10 13:12:08 -07:00
Raymond Yee 84a102c640 Merge pull request #368 from Gluejar/featured_ebook
Featured ebook
2014-07-09 10:19:01 -07:00
Raymond Yee f40350c868 Merge branch 'master' into doab_load 2014-07-08 14:14:51 -07:00
Raymond Yee d14a0dc497 Fixed bug in load_doab_edition: new Work needs to be saved before attaching IDs to it.
code in doab_load.ipynb to load books and test the integrity of the load.  Big surprise (to me):  to find invalid ISBNs in the DOAB data
2014-07-08 09:29:31 -07:00
Raymond Yee 5b3a8d7b13 I've moved the new version of load_doab_edition into core/doab.py from notebook.
Code in doab_loading.ipynb for testing the loading
2014-07-07 11:00:52 -07:00
eric 77a4ef1c09 address "opening a campaign" comments
"hastens" isn't quite right; adding a tooltip to the delete function
would require mucking with django-selectable, and that will take more
time than its worth.
2014-07-03 20:26:36 -04:00
Raymond Yee 833f077de1 With the new arguments in doab.json, I needed to add a catch-all **kwargs to load_doab_edition
functions in regluit.core.doab and regluit.core.tasks.
2014-07-03 10:45:57 -07:00
eric bc7850a2a9 add featured column, use it 2014-07-01 10:07:07 -07:00
Raymond Yee b356699c9b First pass at /opds/{facet} --> now with active_campaigns too 2014-06-25 18:05:57 -07:00
Raymond Yee 8830919318 Add feed=opds to download URLs for ebooks in OPDS feed 2014-06-25 16:54:01 -07:00
Raymond Yee 49133935a0 First draft of opds/creativecommons.xml 2014-06-24 15:27:40 -07:00
eric f38dd948f9 this is all I need to do to skip the claim approval step.
We can always revoke the claim
2014-06-20 14:26:28 -04:00
Raymond Yee b675052736 Merge pull request #362 from Gluejar/edit_language
Edit language [finish #69779438]
2014-06-11 15:13:10 -04:00
Raymond Yee d17836fb58 put in fix to LT scraper -- need now to hit front page to pick up session-like cookies 2014-06-11 08:46:24 -04:00
Raymond Yee f43d40b9f4 [#70942940] Making load_doab_edition more rigorous:
* assuming that 1 DOAB ID associated at most with 1 Work or 1 Edition
* explicitly throw exception if Google Books doesn't recognize the ISBN in question
2014-06-06 16:40:13 -07:00
eric 13f4bfc28d stop filtering language=en in work lookups 2014-06-06 15:42:51 -04:00
eric 7e72a8fff6 remove code that was truncating language codes 2014-06-06 14:47:36 -04:00
Raymond Yee 54c3742ce7 adding a command to load doab books 2014-06-06 11:37:10 -07:00
eric 03f3dd1287 can now edit language via edition edit
Also, the language field is widened to support language ids such as
"zh-tw".
Migration required.
2014-06-06 14:32:34 -04:00
Raymond Yee efdbdf6643 [#70942940] Making the DOAB record loading asynchronous (ie., use Celery) 2014-06-05 16:31:14 -07:00
Raymond Yee 265420dd74 some code to load DOAB records...no code here yet for how I processed the DOAB records into json format yet. 2014-06-04 15:23:47 -07:00
eric a55c31d3ff fix test 2014-05-22 13:19:05 -04:00
eric 314847459b remove readmill, add dropbox 2014-05-20 12:19:34 -04:00
Raymond Yee 4d359b53c1 Merge pull request #348 from Gluejar/list_by_license
List by license [#70951010]
2014-05-14 09:14:03 -07:00
eric 199f862c5f typo 2014-05-08 12:59:39 -04:00
eric 052f5adbc0 add license descriptions and badges to the pages 2014-05-08 11:54:09 -04:00
eric a3ae7e3177 fix test errors. yay tests. 2014-05-08 10:49:59 -04:00
eric de6b8555d1 move CC constants into a module 2014-05-08 10:21:50 -04:00
Raymond Yee c92219f673 Revert "Reverting changes made to fix double click problem -- and moving changes to fix_double_click"
This reverts commit 643d8d358d.
2014-05-07 15:37:19 -07:00
Raymond Yee 6bf70c4f79 Skipping Goodreads test 2014-05-02 14:20:37 -07:00
Raymond Yee 643d8d358d Reverting changes made to fix double click problem -- and moving changes to fix_double_click
Revert "move post monkey subscribe into a task"

This reverts commit 9556c4a792.
2014-05-02 13:59:04 -07:00
eric 9556c4a792 move post monkey subscribe into a task
I'm not able to verify that this works better
2014-05-02 14:07:59 -04:00
eric 183dea1511 patch the personalizer 2014-04-30 15:17:10 -04:00
eric 1c923e63b6 handle exception when no edition
Occurred for 100 years of solitude probably during regrouping
2014-04-28 14:23:43 -04:00