Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgraded Django database to version 15, with citations

Browse Source 
svn: r18581
This commit is contained in:
Doug Blank
2011-12-12 03:43:58 +00:00
parent 5892d0b586
commit d97ece24a6
5 changed files with 235 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/data/templates/view_citation_detail.html Normal file
View File

@@ -0,0 +1,70 @@
{% extends "view_page_detail.html" %}
{% load my_tags %}
{% block content %}
<script type="text/javascript">
$(function(){
$('#tabs').tabs();
});
</script>
<div class="content" id="IndividualDetail">
{{ "/browse|Browse,/source|Sources"|breadcrumb}}
<h3>{{source.title|escape}}</h3>
<div id="summaryarea">
<table class="infolist"> {% comment %} 2 cols {% endcomment %}
<tbody>
<tr>
<td class="ColumnAttribute">Title:</td>
<td class="ColumnValue" id="data">{{source.title|escape}}</td>
</tr>
<tr>
<td class="ColumnAttribute">Author:</td>
<td class="ColumnValue" id="data">{{source.author|escape}}</td>
</tr>
<tr>
<td class="ColumnAttribute">ID:</td>
<td class="ColumnValue" id="data">{{source.gramps_id|escape}}</td>
</tr>
<tr>
<td class="ColumnAttribute">Abbreviation:</td>
<td class="ColumnValue" id="data">{{source.abbrev|escape}}</td>
</tr>
<tr>
<td class="ColumnAttribute">Public information:</td>
<td class="ColumnValue" id="data">{{source.pubinfo|escape}}</td>
</tr>
</tbody>
</table>
</div>
</div>
<!-- Tabs -->
<h2 class="demoHeaders">Tabs</h2>
<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
<li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"><a href="#tab-notes">Notes</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tab-gallery">Gallery</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tab-data">Data</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tab-repositories">Repositories</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tab-references">References</a></li>
</ul>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tab-notes">
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-gallery">
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-data">
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-repositories">
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-references">
</div>
</div>
{% endblock %}

37
src/data/templates/view_citations.html Normal file
View File

@@ -0,0 +1,37 @@
{% extends "view_page.html" %}
{% load my_tags %}
{% block table_data %}
<table cellspacing="0" class="infolist surname" width="90%">
<thead>
<tr>
<th>#</th>
<th>ID</th>
<th>Title</th>
<th>Pub Info</th>
<th>Author</th>
</tr>
</thead>
<tbody>
{% for source in page.object_list %}
<tr class="{% cycle odd,even %}">
<td>{{ forloop.counter|row_count:page }}</td>
<td><a href="/{{view}}/{{source.handle|escape}}" class="noThumb">
<span class="grampsid">[{{source.gramps_id}}]</span></a>
{% if user.is_authenticated %}
<td><a href="/{{view}}/{{source.handle|escape}}">{{source.title|escape}}</a>
<td><a href="/{{view}}/{{source.handle|escape}}">{{source.pubinfo|nbsp}}</a>
<td><a href="/{{view}}/{{source.handle|escape}}">{{source.author|nbsp}}</a>
{% else %}
<td></td>
<td></td>
<td></td>
{% endif %}
</tr>
{% endfor %}
</tbody>
</table>
{% endblock %}

79
src/webapp/dbdjango.py
View File

@@ -34,6 +34,7 @@ import re
from gen.db import DbReadBase, DbWriteBase, DbTxn
from gen.db import (PERSON_KEY,
FAMILY_KEY,
CITATION_KEY,
SOURCE_KEY,
EVENT_KEY,
MEDIA_KEY,
@@ -105,6 +106,7 @@ class DbDjango(DbWriteBase, DbReadBase):
self.family_bookmarks = Bookmarks()
self.event_bookmarks = Bookmarks()
self.place_bookmarks = Bookmarks()
self.citation_bookmarks = Bookmarks()
self.source_bookmarks = Bookmarks()
self.repo_bookmarks = Bookmarks()
self.media_bookmarks = Bookmarks()
@@ -112,6 +114,7 @@ class DbDjango(DbWriteBase, DbReadBase):
self.set_person_id_prefix('I%04d')
self.set_object_id_prefix('O%04d')
self.set_family_id_prefix('F%04d')
self.set_citation_id_prefix('C%04d')
self.set_source_id_prefix('S%04d')
self.set_place_id_prefix('P%04d')
self.set_event_id_prefix('E%04d')
@@ -121,11 +124,13 @@ class DbDjango(DbWriteBase, DbReadBase):
self.id_trans = DjangoTxn("ID Transaction", self, self.dji.Person)
self.fid_trans = DjangoTxn("FID Transaction", self, self.dji.Family)
self.pid_trans = DjangoTxn("PID Transaction", self, self.dji.Place)
self.cid_trans = DjangoTxn("CID Transaction", self, self.dji.Citation)
self.sid_trans = DjangoTxn("SID Transaction", self, self.dji.Source)
self.oid_trans = DjangoTxn("OID Transaction", self, self.dji.Media)
self.rid_trans = DjangoTxn("RID Transaction", self, self.dji.Repository)
self.nid_trans = DjangoTxn("NID Transaction", self, self.dji.Note)
self.eid_trans = DjangoTxn("EID Transaction", self, self.dji.Event)
self.cmap_index = 0
self.smap_index = 0
self.emap_index = 0
self.pmap_index = 0
@@ -138,6 +143,7 @@ class DbDjango(DbWriteBase, DbReadBase):
self.person_map = {}
self.family_map = {}
self.place_map = {}
self.citation_map = {}
self.source_map = {}
self.repository_map = {}
self.note_map = {}
@@ -182,6 +188,8 @@ class DbDjango(DbWriteBase, DbReadBase):
self.dji.add_place(obj.serialize())
elif isinstance(obj, gen.lib.Repository):
self.dji.add_repository(obj.serialize())
elif isinstance(obj, gen.lib.Citation):
self.dji.add_citation(obj.serialize())
elif isinstance(obj, gen.lib.Source):
self.dji.add_source(obj.serialize())
elif isinstance(obj, gen.lib.Note):
@@ -199,6 +207,8 @@ class DbDjango(DbWriteBase, DbReadBase):
self.dji.add_place_detail(obj.serialize())
elif isinstance(obj, gen.lib.Repository):
self.dji.add_repository_detail(obj.serialize())
elif isinstance(obj, gen.lib.Citation):
self.dji.add_citation_detail(obj.serialize())
elif isinstance(obj, gen.lib.Source):
self.dji.add_source_detail(obj.serialize())
elif isinstance(obj, gen.lib.Note):
@@ -279,6 +289,17 @@ class DbDjango(DbWriteBase, DbReadBase):
self.person_prefix = self._validated_id_prefix(val, "I")
self.id2user_format = self.__id2user_format(self.person_prefix)
def set_citation_id_prefix(self, val):
"""
Set the naming template for GRAMPS Citation ID values.
The string is expected to be in the form of a simple text string, or
in a format that contains a C/Python style format string using %d,
such as C%d or C%04d.
"""
self.source_prefix = self._validated_id_prefix(val, "C")
self.cid2user_format = self.__id2user_format(self.citation_prefix)
def set_source_id_prefix(self, val):
"""
Set the naming template for GRAMPS Source ID values.
@@ -402,6 +423,15 @@ class DbDjango(DbWriteBase, DbReadBase):
self.omap_index, self.oid_trans)
return gid
def find_next_citation_gramps_id(self):
"""
Return the next available GRAMPS' ID for a Citation object based off the
citation ID prefix.
"""
self.cmap_index, gid = self.__find_next_gramps_id(self.citation_prefix,
self.cmap_index, self.cid_trans)
return gid
def find_next_source_gramps_id(self):
"""
Return the next available GRAMPS' ID for a Source object based off the
@@ -460,6 +490,9 @@ class DbDjango(DbWriteBase, DbReadBase):
def get_event_handles(self):
return [item.handle for item in self.dji.Event.all()]
def get_citation_handles(self):
return [item.handle for item in self.dji.Citation.all()]
def get_source_handles(self):
return [item.handle for item in self.dji.Source.all()]
@@ -532,6 +565,13 @@ class DbDjango(DbWriteBase, DbReadBase):
data = self.dji.get_repository(repository)
return gen.lib.Repository.create(data)
def make_citation(self, citation):
if self.use_db_cache and citation.cache:
data = cPickle.loads(base64.decodestring(citation.cache))
else:
data = self.dji.get_citation(citation)
return gen.lib.Citation.create(data)
def make_source(self, source):
if self.use_db_cache and source.cache:
data = cPickle.loads(base64.decodestring(source.cache))
@@ -597,6 +637,15 @@ class DbDjango(DbWriteBase, DbReadBase):
return obj
return None
def get_citation_from_handle(self, handle):
if handle in self.import_cache:
return self.import_cache[handle]
try:
citation = self.dji.Citation.get(handle=handle)
except:
return None
return self.make_citation(citation)
def get_source_from_handle(self, handle):
if handle in self.import_cache:
return self.import_cache[handle]
@@ -676,6 +725,9 @@ class DbDjango(DbWriteBase, DbReadBase):
def get_number_of_notes(self):
return self.dji.Note.count()
def get_number_of_citations(self):
return self.dji.Citation.count()
def get_number_of_sources(self):
return self.dji.Source.count()
@@ -697,6 +749,9 @@ class DbDjango(DbWriteBase, DbReadBase):
def get_events_cursor(self):
return Cursor(self.dji.Event, self.get_raw_event_data).iter()
def get_citation_cursor(self):
return Cursor(self.dji.Citation, self.get_raw_citation_data).iter()
def get_source_cursor(self):
return Cursor(self.dji.Source, self.get_raw_source_data).iter()
@@ -709,6 +764,9 @@ class DbDjango(DbWriteBase, DbReadBase):
def has_family_handle(self, handle):
return self.dji.Family.filter(handle=handle).count() == 1
def has_citation_handle(self, handle):
return self.dji.Citation.filter(handle=handle).count() == 1
def has_source_handle(self, handle):
return self.dji.Source.filter(handle=handle).count() == 1
@@ -762,6 +820,15 @@ class DbDjango(DbWriteBase, DbReadBase):
else:
return None
def get_raw_citation_data(self, handle):
try:
return self.dji.get_citation(self.dji.Citation.get(handle=handle))
except:
if handle in self.import_cache:
return self.import_cache[handle].serialize()
else:
return None
def get_raw_source_data(self, handle):
try:
return self.dji.get_source(self.dji.Source.get(handle=handle))
@@ -823,6 +890,14 @@ class DbDjango(DbWriteBase, DbReadBase):
self.commit_family(family, trans)
return family.handle
def add_citation(self, citation, trans, set_gid=True):
if not citation.handle:
citation.handle = Utils.create_id()
if not citation.gramps_id or set_gid:
citation.gramps_id = self.find_next_citation_gramps_id()
self.commit_citation(citation, trans)
return citation.handle
def add_source(self, source, trans, set_gid=True):
if not source.handle:
source.handle = Utils.create_id()
@@ -889,6 +964,9 @@ class DbDjango(DbWriteBase, DbReadBase):
def commit_family(self, family, trans, change_time=None):
self.import_cache[family.handle] = family
def commit_citation(self, citation, trans, change_time=None):
self.import_cache[citation.handle] = citation
def commit_source(self, source, trans, change_time=None):
self.import_cache[source.handle] = source
@@ -918,6 +996,7 @@ class DbDjango(DbWriteBase, DbReadBase):
key2table = {
PERSON_KEY: self.id_trans,
FAMILY_KEY: self.fid_trans,
CITATION_KEY: self.cid_trans,
SOURCE_KEY: self.sid_trans,
EVENT_KEY: self.eid_trans,
MEDIA_KEY: self.oid_trans,

25
src/webapp/grampsdb/views.py
View File

@@ -65,6 +65,7 @@ VIEWS = [
(_('Events'), 'event', Event),
(_('Notes'), 'note', Note),
(_('Media'), 'media', Media),
(_('Citations'), 'citation', Citation),
(_('Sources'), 'source', Source),
(_('Places'), 'place', Place),
(_('Repositories'), 'repository', Repository),
@@ -394,6 +395,13 @@ def view_detail(request, view, handle, action="view"):
raise Http404(_("Requested %s does not exist.") % view)
view_template = 'view_repository_detail.html'
context["tview"] = _("Repository")
elif view == "citation":
try:
obj = Citation.objects.get(handle=handle)
except:
raise Http404(_("Requested %s does not exist.") % view)
view_template = 'view_citation_detail.html'
context["tview"] = _("Citation")
elif view == "source":
try:
obj = Source.objects.get(handle=handle)
@@ -718,6 +726,23 @@ def view(request, view):
object_list = Repository.objects.filter(private).order_by("gramps_id")
view_template = 'view_repositories.html'
total = Repository.objects.all().count()
elif view == "citation":
if request.user.is_authenticated():
private = Q()
else:
# NON-AUTHENTICATED users
private = Q(private=False)
if request.GET.has_key("search"):
search = request.GET.get("search")
object_list = Citation.objects \
.filter(Q(gramps_id__icontains=search) &
private
) \
.order_by("gramps_id")
else:
object_list = Citation.objects.filter(private).order_by("gramps_id")
view_template = 'view_citations.html'
total = Citation.objects.all().count()
elif view == "source":
if request.user.is_authenticated():
private = Q()

24
src/webapp/utils.py
View File

@@ -75,6 +75,7 @@ util_tags = [
"get_person_from_handle",
"event_table",
"name_table",
"citation_table",
"source_table",
"note_table",
"attribute_table",
@@ -280,6 +281,29 @@ def source_table(obj, user, action, url=None, *args):
retval += nbsp("") # to keep tabs same height
return retval
def citation_table(obj, user, action, url=None, *args):
retval = ""
table = Table()
table.columns(_("ID"),
_("Confidence"),
_("Page"))
if user.is_authenticated():
obj_type = ContentType.objects.get_for_model(obj)
citation_refs = dji.CitationRef.filter(object_type=obj_type,
object_id=obj.id)
for citation_ref in citation_refs:
citation = table.db.get_citation_from_handle(citation_ref.citation.handle)
table.row(citation,
citation.confidence,
citation.page,
)
retval += table.get_html()
if user.is_authenticated() and url and action == "view":
retval += make_button(_("Add citation"), (url + "/add") % args)
else:
retval += nbsp("") # to keep tabs same height
return retval
def note_table(obj, user, action, url=None, *args):
retval = ""
table = Table()