Merge pull request #170 from jaredbischof/master

Version 0.8.9
MG-RAST · Apr 4, 2014 · 00595f1 · 00595f1
2 parents 8b758a3 + aeed52c
commit 00595f1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.8.8
+0.8.9
diff --git a/shock-server/controller/node/multi.go b/shock-server/controller/node/multi.go
@@ -59,6 +59,8 @@ func (cr *NodeController) ReadMany(ctx context.Context) error {
 				if value != "" {
 					if numValue, err := strconv.Atoi(value); err == nil {
 						q["$or"] = ListOfMaps{{keyStr: value}, {keyStr: numValue}}
+					} else if value == "null" {
+						q["$or"] = ListOfMaps{{keyStr: value}, {keyStr: nil}}
 					} else {
 						q[keyStr] = value
 					}
@@ -77,6 +79,8 @@ func (cr *NodeController) ReadMany(ctx context.Context) error {
 				if value != "" {
 					if numValue, err := strconv.Atoi(value); err == nil {
 						q["$or"] = ListOfMaps{{key: value}, {key: numValue}}
+					} else if value == "null" {
+						q["$or"] = ListOfMaps{{key: value}, {key: nil}}
 					} else {
 						q[key] = value
 					}

diff --git a/shock-server/main.go b/shock-server/main.go
@@ -109,7 +109,7 @@ func mapRoutes() {
 			R: []string{"node"},
 			T: "Shock",
 			U: host + "/",
-			V: "0.8.8",
+			V: "0.8.9",
 		}
 		return responder.WriteResponseObject(ctx, http.StatusOK, r)
 	})

diff --git a/shock-server/node/node.go b/shock-server/node/node.go
@@ -13,6 +13,7 @@ import (
 	"github.com/MG-RAST/golib/mgo/bson"
 	"io/ioutil"
 	"os"
+	"time"
 )
 
 type Node struct {
@@ -27,8 +28,8 @@ type Node struct {
 	Tags         []string          `bson:"tags" json:"tags"`
 	Revisions    []Node            `bson:"revisions" json:"-"`
 	Linkages     []linkage         `bson:"linkage" json:"linkages"`
-	CreatedOn    string            `bson:"created_on" json:"created_on"`
-	LastModified string            `bson:"last_modified" json:"last_modified"`
+	CreatedOn    time.Time         `bson:"created_on" json:"created_on"`
+	LastModified time.Time         `bson:"last_modified" json:"last_modified"`
 }
 
 type linkage struct {
@@ -58,7 +59,6 @@ func New() (node *Node) {
 	node.Indexes = make(map[string]IdxInfo)
 	node.File.Checksum = make(map[string]string)
 	node.setId()
-	node.LastModified = "-"
 	return
 }
 

diff --git a/shock-server/node/update.go b/shock-server/node/update.go
@@ -272,10 +272,10 @@ func (node *Node) Save() (err error) {
 		n := Node{node.Id, node.Version, node.File, node.Attributes, node.Public, node.Indexes, node.Acl, node.VersionParts, node.Tags, nil, node.Linkages, node.CreatedOn, node.LastModified}
 		node.Revisions = append(node.Revisions, n)
 	}
-	if node.CreatedOn == "" {
-		node.CreatedOn = time.Now().Format(time.UnixDate)
+	if node.CreatedOn.String() == "" {
+		node.CreatedOn = time.Now()
 	} else {
-		node.LastModified = time.Now().Format(time.UnixDate)
+		node.LastModified = time.Now()
 	}
 
 	bsonPath := fmt.Sprintf("%s/%s.bson", node.Path(), node.Id)