From 76b446ad4042b268aee3a6e36733598e93d07edf Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <brad@danga.com>
Date: Sat, 2 Jul 2011 10:35:19 -0700
Subject: [PATCH] When bootstrapping camliRoot publish nodes, set a title for
 the UI.

Change-Id: I2aad15e9fce6ac1e26b1f8f5ba45241983f6caca
---
 server/go/camlistored/publish.go | 41 ++++++++++++++++----------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/server/go/camlistored/publish.go b/server/go/camlistored/publish.go
index e0872e889..3d23391cf 100644
--- a/server/go/camlistored/publish.go
+++ b/server/go/camlistored/publish.go
@@ -24,6 +24,7 @@ import (
 	"log"
 	"os"
 
+	"camli/blobref"
 	"camli/blobserver"
 	"camli/client" // just for NewUploadHandleFromString.  move elsewhere?
 	"camli/jsonconfig"
@@ -131,33 +132,33 @@ func (pub *PublishHandler) ServeHTTP(rw http.ResponseWriter, req *http.Request)
 	}
 }
 
-func (pub *PublishHandler) bootstrapPermanode(jsonSign *JSONSignHandler) os.Error {
+func (pub *PublishHandler) bootstrapPermanode(jsonSign *JSONSignHandler) (err os.Error) {
 	if pn, err := pub.Search.Index().PermanodeOfSignerAttrValue(pub.Search.Owner(), "camliRoot", pub.RootName); err == nil {
 		log.Printf("Publish root %q using existing permanode %s", pub.RootName, pn)
 		return nil
 	}
 	log.Printf("Publish root %q needs a permanode + claim", pub.RootName)
 
-	// Step 1: create a permanode
-	pn, err := jsonSign.SignMap(schema.NewUnsignedPermanode())
-	if err != nil {
-		return fmt.Errorf("error creating new permanode: %v", err)
-	}
-	ph := client.NewUploadHandleFromString(pn)
-	_, err = pub.Storage.ReceiveBlob(ph.BlobRef, ph.Contents)
-	if err != nil {
-		return fmt.Errorf("error uploading permanode: %v", err)
+	defer func() {
+		if perr := recover(); perr != nil {
+			err = perr.(os.Error)
+		}
+	}()
+	signUpload := func(name string, m map[string]interface{}) *blobref.BlobRef {
+		signed, err := jsonSign.SignMap(m)
+		if err != nil {
+			panic(fmt.Errorf("error signing %s: %v", name, err))
+		}
+		ph := client.NewUploadHandleFromString(signed)
+		_, err = pub.Storage.ReceiveBlob(ph.BlobRef, ph.Contents)
+		if err != nil {
+			panic(fmt.Errorf("error uploading %s: %v", name, err))
+		}
+		return ph.BlobRef
 	}
 
-	// Step 2: addd a claim that the new permanode is the desired root.
-	claim, err := jsonSign.SignMap(schema.NewSetAttributeClaim(ph.BlobRef, "camliRoot", pub.RootName))
-	if err != nil {
-		return fmt.Errorf("error creating claim: %v", err)
-	}
-	ch := client.NewUploadHandleFromString(claim)
-	_, err = pub.Storage.ReceiveBlob(ch.BlobRef, ch.Contents)
-	if err != nil {
-		return fmt.Errorf("error uploading claim: %v", err)
-	}
+	pn := signUpload("permanode", schema.NewUnsignedPermanode())
+	signUpload("set-attr camliRoot", schema.NewSetAttributeClaim(pn, "camliRoot", pub.RootName))
+	signUpload("set-attr title", schema.NewSetAttributeClaim(pn, "title", "Publish root node for " + pub.RootName))
 	return nil
 }