diff --git a/glide.lock b/glide.lock index 8b1a49e..d28912f 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ hash: d4bd617b74d617b0e803071ac3ff73bc78bdd4236697d84c62195dac7813abeb -updated: 2017-02-03T15:08:05.446738468-07:00 +updated: 2017-06-05T11:30:29.78135418-07:00 imports: - name: github.com/ajg/form version: 523a5da1a92f01b01f840b61689c0340a0243532 @@ -7,30 +7,70 @@ imports: version: 72acac2207479d21dd45898c2a4264246c818148 subpackages: - ast - - parser - lexer + - parser - name: github.com/bketelsen/ponzi version: 468a9696b3a2b1475cba37233d9f0fdcdf00316a +- name: github.com/blevesearch/bleve + version: 92343394723cab3a09e062610dfcc47636648338 + subpackages: + - analysis + - analysis/analyzer/standard + - analysis/datetime/flexible + - analysis/datetime/optional + - analysis/lang/en + - analysis/token/lowercase + - analysis/token/porter + - analysis/token/stop + - analysis/tokenizer/unicode + - document + - geo + - index + - index/store + - index/store/boltdb + - index/store/gtreap + - index/upsidedown + - mapping + - numeric + - registry + - search + - search/collector + - search/facet + - search/highlight + - search/highlight/format/html + - search/highlight/fragmenter/simple + - search/highlight/highlighter/html + - search/highlight/highlighter/simple + - search/query + - search/scorer + - search/searcher +- name: github.com/blevesearch/go-porterstemmer + version: 23a2c8e5cf1f380f27722c6d2ae8896431dc7d0e + repo: https://github.com/blevesearch/go-porterstemmer +- name: github.com/blevesearch/segment + version: db70c57796cc8c310613541dfade3dce627d09c7 + repo: https://github.com/blevesearch/segment - name: github.com/boltdb/bolt - version: e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd + version: 144418e1475d8bf7abbdc48583500f1a20c62ea7 + repo: https://github.com/boltdb/bolt - name: github.com/bosssauce/reference - version: cd2ad731cc82838bbf280837d0772e5f3c3eb90a + version: 351da7c5a9bb99c63500379b865042b977ea2d66 - name: github.com/daaku/go.zipexe version: a5fe2436ffcb3236e175e5149162b41cd28bd27d - name: github.com/daviddengcn/go-colortext version: 805cee6e0d43c72ba1d4e3275965ff41e0da068a - name: github.com/dustin/go-humanize - version: 7a41df006ff9af79a29f0ffa9c5f21fbe6314a2d + version: 259d2a102b871d17f30e3cd9881a642961a1e486 - name: github.com/fatih/color - version: 42c364ba490082e4815b5222728711b3440603eb + version: 62e9147c64a1ed519147b62a56a14e83e2be02c1 - name: github.com/fsnotify/fsnotify - version: fd9ec7deca8bf46ecd2a795baaacf2b3a9be1197 + version: 4da3e2cfbabc9f751898f250b49f2439785783a1 - name: github.com/GeertJohan/go.rice - version: 9fdfd46f9806a9228aae341d65ab75c5235c383c + version: c02ca9a983da5807ddf7d796784928f5be4afd09 subpackages: - embedded - name: github.com/go-sql-driver/mysql - version: 2e00b5cd70399450106cec6431c2e2ce3cae5034 + version: e3f0fdcf52770a162d5a4540ddb8d9957ff456d1 - name: github.com/gobuffalo/buffalo version: 2c4eb40f82f002a7d999308b0dab91b0aaa37de3 subpackages: @@ -38,33 +78,40 @@ imports: - render - render/resolvers - name: github.com/gobuffalo/envy - version: 5056ec9ebe876e444296d535fcf01fb2ddb8a802 + version: a901aeb76c2647ce52acf7f3bac64c4def49a899 +- name: github.com/gobuffalo/packr + version: ca20eb6355222e403f80fa5c6de7f2a230d7cf7a - name: github.com/gobuffalo/velvet version: 1a8e8f82e94e73731b5c196b11b71b468639a326 +- name: github.com/golang/protobuf + version: 655cdfa588ea190e901bc5590e65d5621688847c + repo: https://github.com/golang/protobuf + subpackages: + - proto - name: github.com/gopheracademy/gccms - version: caee9df616030b0a84625976749b3d8fe7109897 + version: 88ef5cfaef982351a0f401670ee62e29dd89ef6a subpackages: - content - name: github.com/gorilla/context - version: 08b5f424b9271eedf6f9f0ce86cb9396ed337a42 + version: 215affda49addc4c8ef7e2534915df2c8c35c6cd - name: github.com/gorilla/mux - version: 392c28fe23e1c45ddba891b0320b3b5df220beea + version: 8a875a034c69b940914d83ea03d3f1299b4d094b - name: github.com/gorilla/schema - version: dfd60678a6033f19803293695dcd30f40ed3cd19 + version: 1c72d033473165ade8a126ba64180d76a9212dcd - name: github.com/gorilla/securecookie - version: fa5329f913702981df43dcb2a380bac429c810b5 + version: e59506cc896acb7f7bf732d4fdf5e25f7ccd8983 - name: github.com/gorilla/sessions - version: 83c8db3bdc9be789e57e3756ffbcffd2d7d40176 + version: 8b6b4cd75f07f7ee036eb37b8127bd40ab1efc49 - name: github.com/gorilla/websocket - version: bb547c6c5c59732c29a3266d7125a84f6c3fce32 + version: a91eba7f97777409bc2c443f5534d41dd20c5720 - name: github.com/jmoiron/sqlx - version: cac998c4f0959c19c638c523e374fa8e4e0bcfe3 + version: d9bd385d68c068f1fabb5057e3dedcbcbb039d0f subpackages: - reflectx - name: github.com/kardianos/osext - version: c2c54e542fb797ad986b31721e1baedf214ca413 + version: ae77be60afb1dcacde03767a8c37337fad28ac14 - name: github.com/lib/pq - version: 67c3f2a8884c9b1aac5503c8d42ae4f73a93511c + version: 8837942c3e09574accbc5f150e2c5e057189cace subpackages: - oid - name: github.com/markbates/going @@ -72,18 +119,17 @@ imports: subpackages: - defaults - randx - - clam - wait - name: github.com/markbates/grift - version: c2aa95989ee351e49c0ac7ecf4f83ffa6ffbf6ee + version: df531a1c12ae7db5b3deeb45ec29cc353da168e3 subpackages: - grift - name: github.com/markbates/hmax - version: b6c7cb2ab5f435e74dfc81cc9efaf3ce85397f56 + version: 800e180dcd16937a4cc134c6aa8c8407e62ce880 - name: github.com/markbates/inflect - version: 3e74c98c9bcf4148db59b58e94ba545314ae9f61 + version: 6cacb66d100482ef7cc366289ccb156020e57e76 - name: github.com/markbates/pop - version: 6fd48bf499ca68c8258b70c269fe30b332f12d36 + version: 4468fbc52f997319faa48f4947c5d8046d26b741 subpackages: - columns - fizz @@ -91,19 +137,19 @@ imports: - name: github.com/markbates/refresh version: 3b31d64dec02d89d735e1f60c05ed41a43c5207e subpackages: - - refresh/web - refresh + - refresh/web - name: github.com/markbates/validate - version: 2a9b4fec6679aa1384d64216de1e98a1589b65af + version: a54bf3e737cb85a773461923982e9119b343b2a3 subpackages: - validators - name: github.com/markbates/willie version: cf7c4a7c06ea6a65b79294bbfb4ae18b580f6ecc - name: github.com/mattn/anko - version: 146636cd1e5f0beab721a722f2b5a0fb4613e515 + version: a3969c63681391ec413427cae813d6d59d6031f1 subpackages: + - ast - builtins - - vm - builtins/encoding/json - builtins/errors - builtins/flag @@ -112,6 +158,7 @@ imports: - builtins/io - builtins/io/ioutil - builtins/math + - builtins/math/big - builtins/math/rand - builtins/net - builtins/net/http @@ -127,94 +174,107 @@ imports: - builtins/strings - builtins/time - parser - - ast + - vm - name: github.com/mattn/go-colorable - version: d228849504861217f796da67fae4f6e347643f15 + version: 5411d3eea5978e6cdc258b30de592b60df6aba96 - name: github.com/mattn/go-isatty - version: 30a891c33c7cde7b02a981314b4228ec99380cca + version: 57fdcb988a5c543893cc61bce354a6e24ab70022 - name: github.com/mattn/go-sqlite3 - version: 7ed900a7c4cc22315a007cc49821cce3baa7be0f + version: 3fb7a0e792edd47bf0cf1e919dfc14e2be412e15 - name: github.com/microcosm-cc/bluemonday version: e79763773ab6222ca1d5a7cbd9d62d83c1f77081 - name: github.com/mitchellh/go-homedir version: b8bc1bf767474819792c23f32d8286a45736f1c6 - name: github.com/newrelic/go-agent - version: 7d12ae2201fc160e486197614a6f65afcf3f8170 + version: 29ec3cd1bb2f21d21d36da37dae52695cb2c3a17 subpackages: - internal - - internal/logger - - internal/utilization - internal/jsonx + - internal/logger - internal/sysinfo + - internal/utilization - name: github.com/nilslice/jwt version: dab3054ad0d56718877715dc429b95302cf4c7d5 - name: github.com/olekukonko/tablewriter - version: 44e365d423f4f06769182abfeeae2b91be9d529b + version: febf2d34b54a69ce7530036c7503b1c9fbfdf0bb - name: github.com/patrickmn/go-cache - version: e7a9def80f35fe1b170b7b8b68871d59dea117e1 + version: 1881a9bccb818787f68c52bfba648c6cf34c34fa - name: github.com/pkg/errors - version: 248dadf4e9068a0b3e79f02ed0a610d935de5302 + version: c605e284fe17294bda444b34710735b29d1a9d90 - name: github.com/ponzu-cms/ponzu - version: e9747661400953c20f0c9ee7fd3aa003ae8c44af + version: 38aa0ebb1df97ff185d84da2d3c2f9a11888729b subpackages: - management/editor - - system/item - system/addon - - system/db - system/admin/config - system/admin/user + - system/db + - system/item + - system/search - name: github.com/russross/blackfriday - version: 5f33e7b7878355cd2b7e6b8eefc48a5472c69f70 + version: 0ba0f2b6ed7c475a92e4df8641825cb7a11d1fa3 - name: github.com/satori/go.uuid - version: b061729afc07e77a8aa4fad0a2fd840958f1942a + version: 5bf94b69c6b68ee1b541973bb8e1144db23a194b - name: github.com/serenize/snaker - version: 543781d2b79bd95c51ffe70e70a55c946ca211ff + version: 1c7f65329f6524115af8ca01ab604c00cddf5558 - name: github.com/sergi/go-diff - version: 24e2351369ec4949b2ed0dc5c477afdd4c4034e8 + version: feef008d51ad2b3778f85d387ccf91735543008d subpackages: - diffmatchpatch - name: github.com/shurcooL/github_flavored_markdown - version: ee9a372f80c5dd9039b82b41089c9bde01b34c98 + version: 3c64cb3ce00a3f4feae0c53ce7c2cc2fdacba14b - name: github.com/shurcooL/highlight_diff - version: d3b292edd8c8311b9d264e3adc26cdf39695fe9b + version: 09bb4053de1b1d872a9f25dc21378fa71dca4e4e - name: github.com/shurcooL/highlight_go - version: 7867c2dec5d03326c952ca98eda2abf907ddfcf3 + version: 78fb10f4a5f89e812a5e26ab723b954a51226086 +- name: github.com/shurcooL/octiconssvg + version: 1aed2117d2aa8eed76a052936e468e5354750701 - name: github.com/shurcooL/sanitized_anchor_name - version: 1dba4b3954bc059efc3991ec364f9f9a35f597d2 + version: 541ff5ee47f1dddf6a5281af78307d921524bcb5 - name: github.com/Sirupsen/logrus - version: 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d + version: ba1b36c82c5e05c4f912a88eab0dcd91a171688f - name: github.com/sourcegraph/annotate version: f4cad6c6324d3f584e1743d8b3e0e017a5f3a636 - name: github.com/sourcegraph/syntaxhighlight - version: c95ac474b7cb9c711f4591b553a2caaa24ea3d37 + version: bd320f5d308e1a3c4314c678d8227a0d72574ae7 +- name: github.com/steveyen/gtreap + version: 0abe01ef9be25c4aedc174758ec2d917314d6d70 + repo: https://github.com/steveyen/gtreap - name: github.com/stretchr/testify - version: 2402e8e7a02fc811447d11f881aa9746cdc57983 + version: c478a808a1b37e10c82f71a2172728f8742bad51 + subpackages: + - assert + - require - name: github.com/tidwall/gjson - version: e3f249f4fdf33c278edeb770426a6f83c954ae64 + version: c784c417818f59d6597274642d8ac1d09efc9b01 - name: github.com/tidwall/match version: 173748da739a410c5b0b813b956f89ff94730b4c - name: github.com/tidwall/sjson version: 6a22caf2fd45d5e2119bfc3717e984f15a7eb7ee - name: golang.org/x/crypto - version: b8a2a83acfe6e6770b75de42d5ff4c67596675c0 + version: e1a4589e7d3ea14a3352255d04b6f1a418845e5e subpackages: - bcrypt - blowfish - name: golang.org/x/net - version: f2499483f923065a842d38eb4c7f1927e6fc6e6d + version: e45385e9b226f570b1f086bf287b25d3d4117776 subpackages: - context - html - html/atom - name: golang.org/x/sys - version: d75a52659825e75fff6158388dddc6a5b04f9ba5 + version: 9ccfe848b9db8435a24c424abbc07a921adf1df5 subpackages: - unix - name: golang.org/x/text - version: 506f9d5c962f284575e88337e7d9296d27e729d3 + version: ccbd3f7822129ff389f8ca4858a9b9d4d910531c subpackages: - transform - unicode/norm - name: gopkg.in/yaml.v2 - version: a5b47d31c556af34a302ce5d659e6fea44d90de0 -testImports: [] + version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b +testImports: +- name: github.com/kr/pretty + version: cfb55aafdaf3ec08f0db22699ab822c50091b1c4 +- name: github.com/kr/text + version: 7cafcd837844e784b526369c9bce262804aebc60 diff --git a/models/helpers.go b/models/helpers.go index 09daea4..e201692 100644 --- a/models/helpers.go +++ b/models/helpers.go @@ -1,6 +1,7 @@ package models import ( + "errors" "net/url" "strconv" @@ -46,7 +47,7 @@ func getID(s string) (int, error) { vals := u.Query() ii, ok := vals["id"] if !ok { - return 0, err + return 0, errors.New("error: id field not present in url map") } return strconv.Atoi(ii[0]) } diff --git a/models/presentation.go b/models/presentation.go index f368d77..1dbaebc 100644 --- a/models/presentation.go +++ b/models/presentation.go @@ -55,6 +55,10 @@ func GetPresentations() []Presentation { var pr Presentation pr.Presentation = p sid, err := getID(pr.Presentation.Slot) + if err != nil { + fmt.Printf("no id for presentation [%v]. error: %s\n", pr.Presentation.Slot, err) + continue + } slot, err := GetSlot(sid) if err != nil {