Changeset 343:17d63dd0a8d0

Timestamp:

04/28/10 19:21:21 (4 months ago)

Author:

acracia

Branch:

default

Tags:

tip

Message:

persons: now the pd gets calculated with the datetime.today object, and shows pd status (default jurisdiction: uk)

Location:

pdw

Files:

• model/frbr.py (modified) (2 diffs)
• pd/fast.py (modified) (2 diffs)
• templates/about.html (modified) (1 diff)

pdw/model/frbr.py

@@ -96 +96 @@
 from sqlalchemy.ext.associationproxy import association_proxy
 import swiss
+import datetime
 
 from types import *
@@ -244 +245 @@
         # TODO this is a hack at the mo
         if self.death_date_ordered:
-          if self.death_date_ordered < 1938:
+          pdyear = datetime.date.today().year - 70 
+          if self.death_date_ordered < pdyear:
             pd = 1.0
           else:

pdw/pd/fast.py

@@ -2 +2 @@
 '''
 import logging
+import datetime
 
 from pdw.pd import OLDEST_PERSON
@@ -14 +15 @@
     import time
 
-    now = 2008
+    now = datetime.date.today().year
     pd_year = now - 70
     least_age_at_publication = 20

pdw/templates/about.html

@@ -9 +9 @@
     <h3>Background</h3>
                 <p>The Public Domain Works DB is an <a href="http://opendefinition.org/">open</a> registry of artistic works that are in the public domain. It is currently focused on books and sound recordings &ndash; EU countries are currently considering a term extension for sound recordings which would have a dramatic impact on the size of the public domain. In the future it will will expand to cover all types of cultural works which are covered by copyright.</p>
-                <p>The a project was originally created by the <a href="http://www.okfn.org/">Open Knowledge Foundation</a>, <a href="http://www.freeculture.org.uk/">Free Culture UK</a> and the <a href="http://www.openrightsgroup.org/">Open Rights Group</a>. The project is currently being managed by the <a href="http://wiki.okfn.org/wg/publicdomain/">Open Knowledge Foundation's Public Domain Working Group</a>.</p>
+                <p>The a project was originally created in 2005 by the <a href="http://www.okfn.org/">Open Knowledge Foundation</a>, <a href="http://www.freeculture.org.uk/">Free Culture UK</a> and the <a href="http://www.openrightsgroup.org/">Open Rights Group</a>. The project is currently being managed by the <a href="http://wiki.okfn.org/wg/publicdomain/">Open Knowledge Foundation's Public Domain Working Group</a>.</p>
 
     <h3>Get Involved</h3>