From 76c81ab71a760f88c6d7f2a17f1297e72c58d008 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 30 Nov 2009 15:55:04 +0000
Subject: [PATCH] Monotone-Parent: 83e7d2455de99bbdf6ca18f2e16478d506a07412
 Monotone-Revision: 90a9a165bd97c227034ffe99dc1bcd6de1cd3e2b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-11-30T15:55:04
Monotone-Branch: ca.inverse.sogo
---
 SOPE/GDLContentStore/ChangeLog   |  5 +++++
 SOPE/GDLContentStore/NSURL+GCS.h |  6 ++++--
 SOPE/GDLContentStore/NSURL+GCS.m | 20 ++++++++++++++++----
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/SOPE/GDLContentStore/ChangeLog b/SOPE/GDLContentStore/ChangeLog
index 71b67f8dc..314698ee4 100644
--- a/SOPE/GDLContentStore/ChangeLog
+++ b/SOPE/GDLContentStore/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* NSURL+GCS.m (-gcsURLId): new method that returns a unique
+	identifier for database connections.
+
 2009-11-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* GCSChannelManager.m (-releaseChannel:immediately:): new method
diff --git a/SOPE/GDLContentStore/NSURL+GCS.h b/SOPE/GDLContentStore/NSURL+GCS.h
index c03ea403c..26b921461 100644
--- a/SOPE/GDLContentStore/NSURL+GCS.h
+++ b/SOPE/GDLContentStore/NSURL+GCS.h
@@ -33,8 +33,10 @@
 
 @interface NSURL(GCS)
 
-- (NSString *)gcsDatabaseName;
-- (NSString *)gcsTableName;
+- (NSString *) gcsDatabaseName;
+- (NSString *) gcsTableName;
+
+- (NSString *) gcsURLId;
 
 @end
 
diff --git a/SOPE/GDLContentStore/NSURL+GCS.m b/SOPE/GDLContentStore/NSURL+GCS.m
index 4d3f9ed15..48c0a9dd5 100644
--- a/SOPE/GDLContentStore/NSURL+GCS.m
+++ b/SOPE/GDLContentStore/NSURL+GCS.m
@@ -26,7 +26,8 @@
 
 @implementation NSURL(GCS)
 
-- (NSString *)gcsPathComponent:(unsigned)_idx {
+- (NSString *) gcsPathComponent: (unsigned) _idx
+{
   NSString *p;
   NSArray  *pcs;
   unsigned len;
@@ -43,11 +44,22 @@
   return [pcs objectAtIndex:_idx];
 }
 
-- (NSString *)gcsDatabaseName {
-  return [self gcsPathComponent:1];
+- (NSString *) gcsDatabaseName
+{
+  return [self gcsPathComponent: 1];
 }
-- (NSString *)gcsTableName {
+
+- (NSString *) gcsTableName
+{
   return [[self path] lastPathComponent];
 }
 
+- (NSString *) gcsURLId
+{
+  return [NSString stringWithFormat: @"%@:%@:%@:%@:%@",
+                   [self host], [self port],
+                   [self user], [self password], 
+                   [self gcsDatabaseName]];
+}
+
 @end /* NSURL(GCS) */