[Blends-commit] r3245 - in /blends/trunk/webtools: blendstasktools.py templates/tasks.xhtml

[tille at users.alioth.debian.org]

Author: tille
Date: Mon Apr  2 13:31:52 2012
New Revision: 3245

URL: http://svn.debian.org/wsvn/blends/?sc=1&rev=3245
Log:
Profit from new information and link to pubmed + eprint (while droping the DOI link which basically leads to the same page as the main link)

Modified:
    blends/trunk/webtools/blendstasktools.py
    blends/trunk/webtools/templates/tasks.xhtml

Modified: blends/trunk/webtools/blendstasktools.py
URL: http://svn.debian.org/wsvn/blends/blends/trunk/webtools/blendstasktools.py?rev=3245&op=diff
==============================================================================
--- blends/trunk/webtools/blendstasktools.py (original)
+++ blends/trunk/webtools/blendstasktools.py Mon Apr  2 13:31:52 2012
@@ -313,6 +313,7 @@
           volume  text,
           number  text,
           pages   text,
+          eprint  text,
           description_en text, long_description_en text,
           description_cs text, long_description_cs text,
           description_da text, long_description_da text,
@@ -1483,7 +1484,7 @@
                 # package versions in all releases
                 dep.properties['pkg-url'] = PKGURLMASK % dep.pkg
 
-                for pub in ("year", "title", "authors", "doi", "pubmed", "url", "journal", "volume", "number", "pages" ):
+                for pub in ("year", "title", "authors", "doi", "pubmed", "url", "journal", "volume", "number", "pages", "eprint" ):
                     if row[pub]:
                         if not dep.properties.has_key('published'):
                             dep.properties['published'] = {}
@@ -1497,8 +1498,6 @@
                     	    else:
                     	        logger.info("%s conflicting fields Publication-%s in tasks file with value '%s' and in UDD with value '%s'" % (dep.pkg, pub, dep.properties['published'][pub], to_unicode(row[pub])))
                         dep.properties['published'][pub] = to_unicode(row[pub])
-                # if dep.properties.has_key('published'):
-		#    print "DEBUG", dep.pkg, dep.properties['published']
                 for l in languages:
                     if row['description_'+l]:
                         dep.desc[l] = {}

Modified: blends/trunk/webtools/templates/tasks.xhtml
URL: http://svn.debian.org/wsvn/blends/blends/trunk/webtools/templates/tasks.xhtml?rev=3245&op=diff
==============================================================================
--- blends/trunk/webtools/templates/tasks.xhtml (original)
+++ blends/trunk/webtools/templates/tasks.xhtml Mon Apr  2 13:31:52 2012
@@ -176,8 +176,6 @@
 		     <span py:otherwise=""><a href="${project.properties['published']['url']}">Link
 			 to publication</a></span>
 		   </span>
-                   <span py:if="project.properties['published'].has_key('doi')">(<a href="http://dx.doi.org/${project.properties['published']['doi']}">DOI</a>)
-                   </span>
 		 </span>
 		 <span py:when="project.properties['published'].has_key('doi')">
 		   <span py:choose="">
@@ -190,10 +188,9 @@
 		 <span py:otherwise=""><span class="title" py:if="project.properties['published'].has_key('title')">${project.properties['published']['title']}</span>
 		 </span>
 	       </span>
+               <span py:if="project.properties['published'].has_key('pubmed')">(<a href="http://www.ncbi.nlm.nih.gov/pubmed/${project.properties['published']['pubmed']}">PubMed</a></span><span py:if="project.properties['published'].has_key('pubmed') and project.properties['published'].has_key('eprint')">,</span><span py:if="not project.properties['published'].has_key('pubmed') and project.properties['published'].has_key('eprint')">(</span><span py:if="project.properties['published'].has_key('eprint')"><a href="${project.properties['published']['eprint']}">eprint</a></span><span py:if="project.properties['published'].has_key('pubmed') or project.properties['published'].has_key('eprint')">)</span>
 	       <span class="journal" py:if="project.properties['published'].has_key('journal')">${project.properties['published']['journal']}</span>
-	       <span class="journal" py:if="project.properties['published'].has_key('volume')">${project.properties['published']['volume']}</span>
-	       <span class="journal" py:if="project.properties['published'].has_key('number')">(${project.properties['published']['number']})</span>
-	       <span class="journal" py:if="project.properties['published'].has_key('pages')">:${project.properties['published']['pages']}</span>
+	       <span class="journal" py:if="project.properties['published'].has_key('volume')">${project.properties['published']['volume']}</span><span class="journal" py:if="project.properties['published'].has_key('number')">(${project.properties['published']['number']})</span><span class="journal" py:if="project.properties['published'].has_key('pages')">:${project.properties['published']['pages']}</span>
 	       <span class="year" py:if="project.properties['published'].has_key('year')">(${project.properties['published']['year']})</span>
 	     </div>
 	   </td>