From mboxrd@z Thu Jan  1 00:00:00 1970
From: Pete Zaitcev <zaitcev@redhat.com>
Subject: [Patch 2/3] tabled: use correct name for zone attribute
Date: Fri, 28 Aug 2009 20:42:00 -0600
Message-ID: <20090828204200.42f2d7fe@redhat.com>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Return-path: <hail-devel-owner@vger.kernel.org>
Sender: hail-devel-owner@vger.kernel.org
List-ID: <hail-devel.vger.kernel.org>
Content-Type: text/plain; charset="us-ascii"
To: Jeff Garzik <jeff@garzik.org>
Cc: Project Hail List <hail-devel@vger.kernel.org>

We're such a young project and we have legacy arrangements already.
In particular what's used to be called a "building" is now a "zone",
for the benefit of users running their clouds out of missile silos,
huts, tents, vehicles, etc.

Jokes aside, the patch makes tabled to use the correct name that
corresponds to what Chunk publishes.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>

diff --git a/server/storparse.c b/server/storparse.c
index eb40dcd..c5dd3b1 100644
--- a/server/storparse.c
+++ b/server/storparse.c
@@ -214,7 +214,7 @@ static void cfg_elm_end (GMarkupParseContext *context,
 		cc->text = NULL;
 	}
 
-	else if (!strcmp(element_name, "Zone")) {
+	else if (!strcmp(element_name, "Building")) {
 		if (!cc->text)
 			return;
 		if (cc->text[0] == '-')
@@ -225,7 +225,7 @@ static void cfg_elm_end (GMarkupParseContext *context,
 			cc->loc.zone = cc->text;
 		} else {
 			applog(LOG_WARNING,
-			       "%s: Zone not in Geo", cc->fname);
+			       "%s: Building not in Geo", cc->fname);
 			free(cc->text);
 		}
 		cc->text = NULL;