diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-05-04 23:52:42 +0300 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-05-05 19:28:08 +0300 |
| commit | 1d1045fe3a98e81d699cd17f9214cbc1e7f9a66f (patch) | |
| tree | 38cd8ba1fd673d8a145b102b0a74a7c6819e9e68 /src/server | |
| parent | fb5279c841a053d28374ab4550e7ec9141f6d4dd (diff) | |
neo4j schema version: refactor into constant
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/db_op.py | 8 | ||||
| -rw-r--r-- | src/server/neo4j_schema.py | 2 | ||||
| -rw-r--r-- | src/server/rz_server.py | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/server/db_op.py b/src/server/db_op.py index 87523649..b26e280a 100644 --- a/src/server/db_op.py +++ b/src/server/db_op.py @@ -715,7 +715,7 @@ class DBO_rm_link_set(DB_op): class DBO_rzdb__fetch_DB_metablock(DB_op): - def __init__(self, length_lim=None): + def __init__(self): """ Fetch DB metadata @@ -740,12 +740,12 @@ class DBO_rzdb__init_DB(DB_composed_op): class _init_DB_subop(DB_op): - def __init__(self, neo4j_schema_version): + def __init__(self): super(DBO_rzdb__init_DB. _init_DB_subop, self).__init__() # init DB metadata node q_arr = ['create (n:%s {db_attr})' % (neo4j_schema.META_LABEL__RZDB_META)] - q_params = {'db_attr': {'schema_version': neo4j_schema_version}} + q_params = {'db_attr': {'schema_version': neo4j_schema.NEO4J_SCHEMA_VERSION}} self.add_statement(q_arr, q_params) def __init__(self, rz_config): @@ -758,7 +758,7 @@ class DBO_rzdb__init_DB(DB_composed_op): self.add_sub_op(DBO_rzdb__fetch_DB_metablock()) # init DB metadata node - self.add_sub_op(DBO_rzdb__init_DB._init_DB_subop(rz_config.neo4j_schema_version)) + self.add_sub_op(DBO_rzdb__init_DB._init_DB_subop()) # create mainpage mainpage_rzdoc = RZDoc(rz_config.rzdoc__mainpage_name) diff --git a/src/server/neo4j_schema.py b/src/server/neo4j_schema.py index 35ed1a3d..cca56259 100644 --- a/src/server/neo4j_schema.py +++ b/src/server/neo4j_schema.py @@ -1,6 +1,8 @@ # # meta label schema # +NEO4J_SCHEMA_VERSION = '0.2.0' + META_LABEL__RZDB_META = '__RZDB_META' META_LABEL__RZDOC_TYPE = '__RZDOC' # RZdoc node diff --git a/src/server/rz_server.py b/src/server/rz_server.py index dc7d8f74..7442a16b 100644 --- a/src/server/rz_server.py +++ b/src/server/rz_server.py @@ -105,7 +105,6 @@ class Config(object): # Rhizi cfg['rzdoc__mainpage_name'] = 'Welcome Rhizi' cfg['rzdoc__name__max_length'] = 256 - cfg['neo4j_schema_version'] = '0.2.0' ret = Config() ret.__dict__ = cfg # allows setting of @property attributes |