~dobey/shardbridge/trunk

Allow Document content and revision to be null
Allow Document.get_content_string to return null
Implement Database.delete_doc, and test it

added added

removed removed

private string _revision;

private bool _conflicted;

private Json.Object _content;

private Json.Object _content = null;

public Document (string doc_id, string doc_revision,

string doc_content,

string? doc_content,

bool has_conflicts=false) throws DataError {

var match = Regex.match_simple ("^[^/\\\\]+$", doc_id);

if (! match)

_id = doc_id;

_revision = doc_revision;

_conflicted = has_conflicts;

set_content_string (doc_content);

if (doc_content != null && doc_content != "")

set_content_string (doc_content);

}

public string id {

get { return _conflicted; }

}

public string get_content_string () {

public string? get_content_string () {

if (_content == null)

return null;

var generator = new Generator ();

var root = new Json.Node (NodeType.OBJECT);

string data;

}

public void set_content_string (string content_string)

throws DataError {

throws DataError

{

if (content_string == "")

return;

try {

var parser = new Parser ();

if (!parser.load_from_data (content_string, -1))