DjangoDb: currently gramps.webapp contains copy of addon code

gramps/webapp/databases/database1/__init__.py

@@ -1,34 +0,0 @@
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2012      Douglas S. Blank <doug.blank@gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-from django.conf import settings
-from . import default_settings
-try:
-    settings.configure(default_settings)
-except RuntimeError:
-    # already configured; ignore
-    pass
-
-from gramps.webapp.dbdjango import DbDjango
-database = DbDjango()
-
-# For Django 1.6:
-import django
-django.setup()
-

gramps/webapp/databases/database1/default_settings.py

@@ -1,150 +0,0 @@
-import os
-from gramps.gen.const import DATA_DIR
-
-WEB_DIR = os.path.dirname(os.path.realpath(__file__))
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-INTERNAL_IPS = ('127.0.0.1',)
-
-ADMINS = (
-    ('admin', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-DATABASE_ROUTERS = []
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(WEB_DIR, 'sqlite.db'),
-    }
-}
-DATABASE_ENGINE = 'sqlite3'           
-DATABASE_NAME = os.path.join(WEB_DIR, 'sqlite.db')
-DATABASE_USER = ''             
-DATABASE_PASSWORD = ''         
-DATABASE_HOST = ''             
-DATABASE_PORT = ''             
-TIME_ZONE = 'America/New_York'
-LANGUAGE_CODE = 'en-us'
-SITE_ID = 1
-USE_I18N = True
-MEDIA_ROOT = ''
-MEDIA_URL = ''
-ADMIN_MEDIA_PREFIX = '/gramps-media/'
-SECRET_KEY = 'zd@%vslj5sqhx94_8)0hsx*rk9tj3^ly$x+^*tq4bggr&uh$ac'
-
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader', # 1.4
-    'django.template.loaders.app_directories.Loader', # 1.4
-   #'django.template.loaders.filesystem.load_template_source',
-   #'django.template.loaders.app_directories.load_template_source',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-#   'debug_toolbar.middleware.DebugToolbarMiddleware',
-)
-
-ROOT_URLCONF = 'gramps.webapp.urls'
-STATIC_URL = '/static/' # 1.4
-
-TEMPLATE_DIRS = (
-    # Use absolute paths, not relative paths.
-    os.path.join(DATA_DIR, "templates"),
-)
-
-TEMPLATE_CONTEXT_PROCESSORS = (
-    "django.contrib.auth.context_processors.auth", # 1.4
-    "django.contrib.messages.context_processors.messages", # 1.4
-#   "django.core.context_processors.auth",
-#   "django.core.context_processors.debug",
-    "django.core.context_processors.i18n",
-    "django.core.context_processors.media",
-    "gramps.webapp.grampsdb.views.context_processor",
-    "gramps.webapp.context.messages",
-)
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.staticfiles',
-    'django.contrib.messages', # 1.4
-    'django.contrib.sites',
-    'django.contrib.admin',
-    'gramps.webapp.grampsdb',
-#    'django_extensions',
-#    'debug_toolbar',
-)
-
-DEBUG_TOOLBAR_PANELS = (
-    'debug_toolbar.panels.version.VersionDebugPanel',
-    'debug_toolbar.panels.timer.TimerDebugPanel',
-    'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
-    'debug_toolbar.panels.headers.HeaderDebugPanel',
-    'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
-    'debug_toolbar.panels.template.TemplateDebugPanel',
-    'debug_toolbar.panels.sql.SQLDebugPanel',
-    'debug_toolbar.panels.signals.SignalDebugPanel',
-    'debug_toolbar.panels.logger.LoggingPanel',
-    )
-
-def custom_show_toolbar(request):
-    return True # Always show toolbar, for example purposes only.
-
-DEBUG_TOOLBAR_CONFIG = {
-    'INTERCEPT_REDIRECTS': False,
-#    'SHOW_TOOLBAR_CALLBACK': custom_show_toolbar,
-#    'EXTRA_SIGNALS': ['myproject.signals.MySignal'],
-    'HIDE_DJANGO_SQL': False,
-    }
-
-AUTH_PROFILE_MODULE = "grampsdb.Profile"
-
-# Had to add these to use settings.configure():
-DATABASE_OPTIONS = ''
-URL_VALIDATOR_USER_AGENT = ''
-DEFAULT_INDEX_TABLESPACE = ''
-DEFAULT_TABLESPACE = ''
-CACHE_BACKEND = 'locmem://'
-TRANSACTIONS_MANAGED = False
-LOCALE_PATHS = tuple()
-
-# Changes for Django 1.3:
-USE_L10N = True
-FORMAT_MODULE_PATH = ""
-## End Changes for Django 1.3
-
-# Changes for Django 1.4:
-USE_TZ = False
-## End Changes for Django 1.4
-
-# Changes for Django 1.5:
-CACHES = {
-    'default': {
-        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-        }
-    }
-DEFAULT_CHARSET = "utf-8"
-## End Changes for Django 1.5
-
-## Changes for Django 1.5.4:
-LOGGING_CONFIG = None
-AUTH_USER_MODEL = 'auth.User'
-## End Changes for Django 1.5.4
-
-LOGIN_URL = "/login/"
-LOGOUT_URL = "/logout"
-LOGIN_REDIRECT_URL = "/"
-
-## Changes for Django 1.6:
-LOGGING = None
-
-## Changes for Django 1.7.1:
-ABSOLUTE_URL_OVERRIDES = {}

gramps/webapp/databases/database2/__init__.py

@@ -1,34 +0,0 @@
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2012      Douglas S. Blank <doug.blank@gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-from django.conf import settings
-from . import default_settings
-try:
-    settings.configure(default_settings)
-except RuntimeError:
-    # already configured; ignore
-    pass
-
-from gramps.webapp.dbdjango import DbDjango
-database = DbDjango()
-
-# For Django 1.6:
-import django
-django.setup()
-

gramps/webapp/databases/database2/default_settings.py

@@ -1,150 +0,0 @@
-import os
-from gramps.gen.const import DATA_DIR
-
-WEB_DIR = os.path.dirname(os.path.realpath(__file__))
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-INTERNAL_IPS = ('127.0.0.1',)
-
-ADMINS = (
-    ('admin', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-DATABASE_ROUTERS = []
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(WEB_DIR, 'sqlite.db'),
-    }
-}
-DATABASE_ENGINE = 'sqlite3'           
-DATABASE_NAME = os.path.join(WEB_DIR, 'sqlite.db')
-DATABASE_USER = ''             
-DATABASE_PASSWORD = ''         
-DATABASE_HOST = ''             
-DATABASE_PORT = ''             
-TIME_ZONE = 'America/New_York'
-LANGUAGE_CODE = 'en-us'
-SITE_ID = 1
-USE_I18N = True
-MEDIA_ROOT = ''
-MEDIA_URL = ''
-ADMIN_MEDIA_PREFIX = '/gramps-media/'
-SECRET_KEY = 'zd@%vslj5sqhx94_8)0hsx*rk9tj3^ly$x+^*tq4bggr&uh$ac'
-
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader', # 1.4
-    'django.template.loaders.app_directories.Loader', # 1.4
-   #'django.template.loaders.filesystem.load_template_source',
-   #'django.template.loaders.app_directories.load_template_source',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-#   'debug_toolbar.middleware.DebugToolbarMiddleware',
-)
-
-ROOT_URLCONF = 'gramps.webapp.urls'
-STATIC_URL = '/static/' # 1.4
-
-TEMPLATE_DIRS = (
-    # Use absolute paths, not relative paths.
-    os.path.join(DATA_DIR, "templates"),
-)
-
-TEMPLATE_CONTEXT_PROCESSORS = (
-    "django.contrib.auth.context_processors.auth", # 1.4
-    "django.contrib.messages.context_processors.messages", # 1.4
-#   "django.core.context_processors.auth",
-#   "django.core.context_processors.debug",
-    "django.core.context_processors.i18n",
-    "django.core.context_processors.media",
-    "gramps.webapp.grampsdb.views.context_processor",
-    "gramps.webapp.context.messages",
-)
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.staticfiles',
-    'django.contrib.messages', # 1.4
-    'django.contrib.sites',
-    'django.contrib.admin',
-    'gramps.webapp.grampsdb',
-#    'django_extensions',
-#    'debug_toolbar',
-)
-
-DEBUG_TOOLBAR_PANELS = (
-    'debug_toolbar.panels.version.VersionDebugPanel',
-    'debug_toolbar.panels.timer.TimerDebugPanel',
-    'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
-    'debug_toolbar.panels.headers.HeaderDebugPanel',
-    'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
-    'debug_toolbar.panels.template.TemplateDebugPanel',
-    'debug_toolbar.panels.sql.SQLDebugPanel',
-    'debug_toolbar.panels.signals.SignalDebugPanel',
-    'debug_toolbar.panels.logger.LoggingPanel',
-    )
-
-def custom_show_toolbar(request):
-    return True # Always show toolbar, for example purposes only.
-
-DEBUG_TOOLBAR_CONFIG = {
-    'INTERCEPT_REDIRECTS': False,
-#    'SHOW_TOOLBAR_CALLBACK': custom_show_toolbar,
-#    'EXTRA_SIGNALS': ['myproject.signals.MySignal'],
-    'HIDE_DJANGO_SQL': False,
-    }
-
-AUTH_PROFILE_MODULE = "grampsdb.Profile"
-
-# Had to add these to use settings.configure():
-DATABASE_OPTIONS = ''
-URL_VALIDATOR_USER_AGENT = ''
-DEFAULT_INDEX_TABLESPACE = ''
-DEFAULT_TABLESPACE = ''
-CACHE_BACKEND = 'locmem://'
-TRANSACTIONS_MANAGED = False
-LOCALE_PATHS = tuple()
-
-# Changes for Django 1.3:
-USE_L10N = True
-FORMAT_MODULE_PATH = ""
-## End Changes for Django 1.3
-
-# Changes for Django 1.4:
-USE_TZ = False
-## End Changes for Django 1.4
-
-# Changes for Django 1.5:
-CACHES = {
-    'default': {
-        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-        }
-    }
-DEFAULT_CHARSET = "utf-8"
-## End Changes for Django 1.5
-
-## Changes for Django 1.5.4:
-LOGGING_CONFIG = None
-AUTH_USER_MODEL = 'auth.User'
-## End Changes for Django 1.5.4
-
-LOGIN_URL = "/login/"
-LOGOUT_URL = "/logout"
-LOGIN_REDIRECT_URL = "/"
-
-## Changes for Django 1.6:
-LOGGING = None
-
-## Changes for Django 1.7.1:
-ABSOLUTE_URL_OVERRIDES = {}

gramps/webapp/grampsdb/view/event.py

@@ -24,7 +24,7 @@ from gramps.webapp.utils import _, boolean, update_last_changed, build_search
 from gramps.webapp.grampsdb.models import Event, EventType, EventRef, EventRoleType, Person
 from gramps.webapp.grampsdb.forms import *
 from gramps.webapp.libdjango import DjangoInterface, lookup_role_index
-from gramps.webapp.dbdjango import DbDjango
+from gramps.webapp.djangodb import DbDjango
 from gramps.gen.datehandler import displayer, parser
 
 ## Django Modules

gramps/webapp/grampsdb/view/note.py

@@ -24,7 +24,7 @@ from gramps.webapp.utils import _, boolean, update_last_changed, StyledNoteForma
 from gramps.webapp.grampsdb.models import Note
 from gramps.webapp.grampsdb.forms import *
 from gramps.webapp.libdjango import DjangoInterface
-from gramps.webapp.dbdjango import DbDjango
+from gramps.webapp.djangodb import DbDjango
 
 ## Django Modules
 from django.shortcuts import get_object_or_404, render_to_response, redirect

gramps/webapp/grampsdb/views.py

@@ -60,7 +60,7 @@ import gramps.webapp
 from gramps.webapp.utils import _, build_args
 from gramps.webapp.grampsdb.models import *
 from gramps.webapp.grampsdb.view import *
-from gramps.webapp.dbdjango import DbDjango
+from gramps.webapp.djangodb import DbDjango
 import gramps.cli.user
 
 # Menu: (<Nice name>, /<path>/, <Model> | None, Need authentication ) 

gramps/webapp/libdjango.py

@@ -55,7 +55,7 @@ from gramps.gen.constfunc import conv_to_unicode
 #    tuple = dji.get_person(djperson)
 #    gperson = lib.gen.Person(tuple)
 # OR
-#    gperson = dbdjango.DbDjango().get_person_from_handle(handle)
+#    gperson = djangodb.DbDjango().get_person_from_handle(handle)
 
 def check_diff(item, raw):
     encoded = str(base64.encodebytes(pickle.dumps(raw)), "utf-8")

gramps/webapp/reports.py

@@ -38,8 +38,8 @@ import os
 #     settings.configure(default_settings)
 # except:
 #     pass
-# import dbdjango
+# import djangodb
-# db = dbdjango.DbDjango()
+# db = djangodb.DbDjango()
 # run_report(db, "ancestor_report", off="txt", of="ar.txt", pid="I0363")
 
 def get_plugin_options(db, pid):

gramps/webapp/shell.py

@@ -71,7 +71,7 @@ django.setup()
 
 from gramps.webapp.grampsdb.models import *
 from gramps.webapp.grampsdb.forms import *
-from gramps.webapp.dbdjango import DbDjango
+from gramps.webapp.djangodb import DbDjango
 from gramps.webapp.reports import import_file, export_file
 from gramps.webapp.libdjango import DjangoInterface, totime, todate
 from gramps.gen.datehandler import displayer, parser

gramps/webapp/utils.py

@@ -46,7 +46,7 @@ from django.db.models import Q
 import gramps.webapp.grampsdb.models as models
 import gramps.webapp.grampsdb.forms as forms
 from gramps.webapp import libdjango
-from gramps.webapp.dbdjango import DbDjango
+from gramps.webapp.djangodb import DbDjango
 from gramps.cli.user import User as GUser # gramps user
 
 #------------------------------------------------------------------------