From f4f1c6e7c117957680aac322e271e8c77f107b77 Mon Sep 17 00:00:00 2001 From: arleincho Date: Thu, 22 Nov 2012 16:09:19 -0500 Subject: [PATCH] add feature connect with user and password to server --- plugins/surf.allegro_franz/allegro_franz/reader.py | 6 +++++- plugins/surf.allegro_franz/allegro_franz/writer.py | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/plugins/surf.allegro_franz/allegro_franz/reader.py b/plugins/surf.allegro_franz/allegro_franz/reader.py index d7f390c..3ccb7e4 100644 --- a/plugins/surf.allegro_franz/allegro_franz/reader.py +++ b/plugins/surf.allegro_franz/allegro_franz/reader.py @@ -52,13 +52,15 @@ def __init__(self, *args, **kwargs): self.__server = kwargs['server'] if 'server' in kwargs else 'localhost' self.__port = kwargs['port'] if 'port' in kwargs else 6789 + self.__user = kwargs['user'] if 'user' in kwargs else None + self.__password = kwargs['password'] if 'password' in kwargs else None self.__catalog = kwargs['catalog'] if 'catalog' in kwargs else None self.__repository = kwargs['repository'] if 'repository' in kwargs else None if not self.__catalog or not self.__repository: raise Exception('Must specify the and the arguments') - self.__allegro_server = AllegroGraphServer(self.__server, port = self.__port) + self.__allegro_server = AllegroGraphServer(self.__server, port = self.__port, user = self.__user, password = self.__password) self.__allegro_catalog = self.__allegro_server.openCatalog(self.__catalog) self.__allegro_repository = self.__allegro_catalog.getRepository(self.__repository, Repository.ACCESS) self.__allegro_repository.initialize() @@ -68,6 +70,8 @@ def __init__(self, *args, **kwargs): results_format = property(lambda self: 'json') server = property(lambda self: self.__server) port = property(lambda self: self.__port) + user = property(lambda self: self.__user) + password = property(lambda self: self.__password) catalog = property(lambda self: self.__catalog) repository = property(lambda self: self.__repository) diff --git a/plugins/surf.allegro_franz/allegro_franz/writer.py b/plugins/surf.allegro_franz/allegro_franz/writer.py index 44e9533..7e4c724 100644 --- a/plugins/surf.allegro_franz/allegro_franz/writer.py +++ b/plugins/surf.allegro_franz/allegro_franz/writer.py @@ -51,6 +51,8 @@ def __init__(self, reader, *args, **kwargs): if isinstance(self.reader, ReaderPlugin): self.__server = self.reader.server self.__port = self.reader.port + self.__user = self.reader.user + self.__password = self.reader.password self.__catalog = self.reader.catalog self.__repository = self.reader.repository @@ -61,13 +63,15 @@ def __init__(self, reader, *args, **kwargs): else: self.__server = kwargs['server'] if 'server' in kwargs else 'localhost' self.__port = kwargs['port'] if 'port' in kwargs else 6789 + self.__user = kwargs['user'] if 'user' in kwargs else None + self.__password = kwargs['password'] if 'password' in kwargs else None self.__catalog = kwargs['catalog'] if 'catalog' in kwargs else None self.__repository = kwargs['repository'] if 'repository' in kwargs else None if not self.__catalog or not self.__repository: raise Exception('Must specify the and the arguments') - self.__allegro_server = AllegroGraphServer(self.__server, port = self.__port) + self.__allegro_server = AllegroGraphServer(self.__server, port = self.__port, user = self.__user, password = self.__password) self.__allegro_catalog = self.__allegro_server.openCatalog(self.__catalog) self.__allegro_repository = self.__allegro_catalog.getRepository(self.__repository, Repository.ACCESS) self.__allegro_repository.initialize() @@ -78,6 +82,8 @@ def __init__(self, reader, *args, **kwargs): results_format = property(lambda self: 'json') server = property(lambda self: self.__server) port = property(lambda self: self.__port) + user = property(lambda self: self.__user) + password = property(lambda self: self.__password) catalog = property(lambda self: self.__catalog) repository = property(lambda self: self.__repository)