# HG changeset patch # User dwinter # Date 1369727263 -7200 # Node ID b554becd82266e5a84eb0dfbc4bc6067c9726c30 # Parent f8e914a4992d3093dc44028611765b0d93b97d74 Incomplete - # 74: More Link auf den pers?nlichne Homepages https://it-dev.mpiwg-berlin.mpg.de/tracs/webpage/ticket/74 diff -r f8e914a4992d -r b554becd8226 MPIWGStaff.py --- a/MPIWGStaff.py Mon May 27 23:12:33 2013 +0200 +++ b/MPIWGStaff.py Tue May 28 09:47:43 2013 +0200 @@ -728,7 +728,7 @@ def getPublicationsFromPubman(self,limit=None,publicationType=None): - if self.content.publications_mode=="year" or publicationType is not None: + if self.content.publications_mode=="year": coneId = self.getConeId(); if coneId: pubs= self.folder.getPublicationsFromPubman(coneId,limit=limit,publicationType=publicationType) @@ -742,9 +742,27 @@ for selPub in selPubs: if limit and count >= limit: break - count+=1 + logging.debug("searchFor:%s"%selPub.escidocid) - pubs.append((selPub.escidocid,self.mpiwgPubman.getEntryFromPubman(selPub.escidocid))) + + entry = self.mpiwgPubman.getEntryFromPubman(selPub.escidocid,extendedData=True); + + #TODO getEntryFromPubmanShould return long texts + typesLongShort={'http://purl.org/eprint/type/Book':'book', + 'http://purl.org/eprint/type/BookItem':'book-item', + 'http://purl.org/escidoc/metadata/ves/publication-types/article':'article'}; + + + + + + if publicationType is not None: #publicaitions typ ist gesetzt + + if not ((entry[1] == publicationType) or (entry[1] == typesLongShort.get(publicationType,''))) : #stimmt nicht dann weiter + continue; + + pubs.append((selPub.escidocid,entry[0])); + count+=1 return pubs return {} diff -r f8e914a4992d -r b554becd8226 css/mpiwg.css --- a/css/mpiwg.css Mon May 27 23:12:33 2013 +0200 +++ b/css/mpiwg.css Tue May 28 09:47:43 2013 +0200 @@ -6,7 +6,7 @@ div.hierlist li.li_project a{ - padding-left:0px; + /*padding-left:0px;*/ } body { diff -r f8e914a4992d -r b554becd8226 zpt/staff/pubman/show_publications.zpt --- a/zpt/staff/pubman/show_publications.zpt Mon May 27 23:12:33 2013 +0200 +++ b/zpt/staff/pubman/show_publications.zpt Tue May 28 09:47:43 2013 +0200 @@ -18,17 +18,18 @@