From d0fbfd9751db83ee589d5dd2aa1fc27d60dd912a Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Fri, 25 Jul 2014 14:41:17 -0700 Subject: [PATCH] nodeattr: rename Content to CamliContent, since Content also exists. Change-Id: I305ca3cecf9b223a125fb9207966995c9dbf83b8 --- pkg/importer/picasa/picasa.go | 2 +- pkg/schema/nodeattr/nodeattr.go | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/importer/picasa/picasa.go b/pkg/importer/picasa/picasa.go index a1d62201c..e518e69d5 100644 --- a/pkg/importer/picasa/picasa.go +++ b/pkg/importer/picasa/picasa.go @@ -262,7 +262,7 @@ func (r *run) importPhoto(albumNode *importer.Object, photo picago.Photo, client } attrs := []string{ - nodeattr.Content, fileRef.String(), + nodeattr.CamliContent, fileRef.String(), "picasaId", photo.ID, nodeattr.Title, photo.Title, "caption", photo.Summary, diff --git a/pkg/schema/nodeattr/nodeattr.go b/pkg/schema/nodeattr/nodeattr.go index 0240b8ba5..ef47e0017 100644 --- a/pkg/schema/nodeattr/nodeattr.go +++ b/pkg/schema/nodeattr/nodeattr.go @@ -36,12 +36,11 @@ const ( // Well-defined ones are documented in doc/schema/claims/attributes.txt. Type = "camliNodeType" - // Content is "camliContent", the blobref of the permanode's content. + // CamliContent is "camliContent", the blobref of the permanode's content. // For files or images, the camliContent is fileref (the blobref of // the "file" schema blob). - Content = "camliContent" + CamliContent = "camliContent" - Latitude = "latitude" + Latitude = "latitude" Longitude = "longitude" - )