def api_entry_new(notebook): """ Create a new revision and entry. You can POST a new json object to this URL and get back the JSON-ified page, it's entry, the fully-spec'd rev. Note the input json must contain class and then any of the requirements for this class, for example: all: archived: tags: text: title body page: title entries : [ {entry:, hidden:, rev:},] figure: title caption images returns : {'entry' : standard entry doc, 'revision' : standard revision doc } or 400 if an invalid request """ if request.mimetype != "application/json": return "Invalid request type, must be application/json", HTTP_ERROR_CLIENT_BADREQUEST request_data = request.json if 'class' not in request_data: return "'class' not present in request", HTTP_ERROR_CLIENT_BADREQUEST dclass = request_data['class'] if dclass not in dm.json_to_rev: return "Unknown class", HTTP_ERROR_CLIENT_BADREQUEST rev = dm.json_to_rev[dclass](request_data) archived = request_data.get("archived", False) tags = request_data.get("tags", []) rev.update(dm.revision_create(session["user_id"], app.config['DB_SYSTEM_DATABASE'], archived=archived, tags = tags)) nbdb = g.dbconn[get_nb_dbname(notebook)] revid = nbdb.revisions.insert(rev, safe=True) rev["_id"] = revid ent_dict = dm.entry_create(dbref("revisions", revid), dclass, rev) entid = nbdb.entries.insert(ent_dict, safe=True) ent_dict["_id"] = entid # tag cleanup [tagutils.inc_tag(nbdb, t) for t in tags] rev_json = dm.rev_to_json[dclass](rev) return jsonify({'entry' : {'class' : dclass, 'head' : str(revid), '_id' : str(entid)}, 'revision' : rev_json})
def api_entry_get_post(notebook, entryid): """ GET the latest entry and rev for an entry POST an updated rev. Note that we extract out the relevant fields from the submitted doc, and overwrite other relevant ones. Things that must be present include: class parent: Parent points to the old entry; this is also what we think the entry currently points to doc-specific entries we rewrite : author (current logged in author) date _id : with the new updated revid and update the entry If the entry is out of date, we reject, and instead return the latest entry/rev, with error 409 """ nbdb = g.dbconn[get_nb_dbname(notebook)] if request.method == 'POST': """ Perform an update, assuming that the doc is pretty well-formed """ if request.mimetype != "application/json": return "Invalid request type, must be application/json", HTTP_ERROR_CLIENT_BADREQUEST rd = request.json dclass = rd['class'] parent = rd['parent'] if dclass == 'text': rev = dm.text_entry_revision_create(rd['title'], rd['body']) elif dclass == 'figure': rev = dm.figure_entry_revision_create(rd['title'], rd['caption'], rd.get('maxsize', None), gallery = rd.get("gallery", False), images = rd['images']) elif dclass == 'markdown' : rev = dm.markdown_entry_revision_create(rd['title'], rd['body']) elif dclass == 'page': rev = dm.page_entry_revision_create(rd['title'], rd['entries']) else: raise Exception("Unknown entry class '%s'" % dclass) author = dbref("users", session["user_id"]) tags = rd.get("tags", []) pref = dbref("revisions", parent) rev.update(dm.revision_create(session["user_id"], app.config['DB_SYSTEM_DATABASE'], parent=pref, archived=rd.get('archived', False), tags = tags)) # save the revision new_rev_oid = nbdb.revisions.insert(rev, safe=True) rev["_id"] = new_rev_oid new_entry_doc = dm.entry_create(dbref('revisions', new_rev_oid), dclass, rev) res = nbdb.entries.update({'_id' : bson.objectid.ObjectId(entryid), 'head' : dbref('revisions', parent), 'class' : dclass}, new_entry_doc, safe=True) new_entry_doc["_id"] = bson.objectid.ObjectId(entryid) if res['updatedExisting'] == True: # success! # get the old revisions tags, compute the diff olddoc = nbdb.dereference(dbref('revisions', parent)) tagdeltas = tagutils.tagdelta(olddoc.get('tags', []), tags) [tagutils.inc_tag(nbdb, t) for t in tagdeltas[0]] [tagutils.dec_tag(nbdb, t) for t in tagdeltas[1]] new_rev_doc_json = dm.rev_to_json[dclass](rev) entry_doc_json = dm.entry_to_json(new_entry_doc) return jsonify({"latest_entry_doc" : entry_doc_json, "latest_revision_doc" : new_rev_doc_json}) else: # failed to update, meaning someone else updated the entry ahead of us nbdb.revisions.remove({'_id' : new_rev_oid}) entry_ref = dbref("entries", entryid) latest_entry_doc = nbdb.dereference(entry_ref) true_latest_rev_ref = latest_entry_doc['head'] latest_rev_doc = nbdb.dereference(true_latest_rev_ref) latest_rev_json = dm.page_rev_to_json(latest_rev_doc) entry_doc_json = dm.entry_to_json(latest_entry_doc) return jsonify_error({"reason" : "Incorrect latest", "latest_entry_doc": entry_doc_json, "latest_revision_doc" : latest_rev_json}, HTTP_ERROR_CLIENT_CONFLICT) elif request.method == "GET": # fixme update this to use denormalized stuff entry_ref = dbref("entries", entryid) entry_doc = nbdb.dereference(entry_ref) latest_page_ref = entry_doc['head'] latest_page_rev = nbdb.dereference(latest_page_ref) return jsonify({"entry" : dm.entry_to_json(entry_doc), "revision" : dm.rev_to_json[entry_doc['class']](latest_page_rev)})