Revision 6dc32b87
Added by Andreas Müller over 9 years ago
| cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/bci/BciSchemaAdapter.java | ||
|---|---|---|
| 174 | 174 |
reference.setPublisher(text); |
| 175 | 175 |
} |
| 176 | 176 |
if(dcFieldName.equals(DC_CREATOR)){
|
| 177 |
TeamOrPersonBase authorTeam = new Team();
|
|
| 178 |
authorTeam.setTitleCache(text, true);
|
|
| 179 |
reference.setAuthorship(authorTeam);
|
|
| 177 |
TeamOrPersonBase authorship = new Team();
|
|
| 178 |
authorship.setTitleCache(text, true);
|
|
| 179 |
reference.setAuthorship(authorship);
|
|
| 180 | 180 |
} |
| 181 | 181 |
|
| 182 | 182 |
} |
| cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/openurl/MobotOpenUrlResponseSchemaAdapter.java | ||
|---|---|---|
| 157 | 157 |
OpenUrlReference reference = null; |
| 158 | 158 |
|
| 159 | 159 |
ResponseStatus status = null; |
| 160 |
Team authorTeam = null;
|
|
| 160 |
Team authorship = null;
|
|
| 161 | 161 |
String message = null; |
| 162 | 162 |
|
| 163 | 163 |
String elementName = null; |
| ... | ... | |
| 175 | 175 |
} else if (status != null && qName.equals(OPENURL_RESPONSE_CITATION)) {
|
| 176 | 176 |
reference = new OpenUrlReference(); |
| 177 | 177 |
} else if (reference != null && qName.equals(AUTHORS)) {
|
| 178 |
authorTeam = Team.NewInstance();
|
|
| 178 |
authorship = Team.NewInstance();
|
|
| 179 | 179 |
} else if (reference != null && qName.equals(SUBJECTS)) {
|
| 180 | 180 |
//TODO implement, but no equivalent in the cdm model |
| 181 | 181 |
} else {
|
| ... | ... | |
| 192 | 192 |
referenceList.add(reference); |
| 193 | 193 |
reference = null; |
| 194 | 194 |
} else if (reference != null && qName.equals(AUTHORS)) {
|
| 195 |
reference.setAuthorship(authorTeam);
|
|
| 196 |
authorTeam = null;
|
|
| 195 |
reference.setAuthorship(authorship);
|
|
| 196 |
authorship = null;
|
|
| 197 | 197 |
} else if (reference != null && qName.equals(SUBJECTS)) {
|
| 198 | 198 |
//TODO implement, but no equivalent in the cdm model |
| 199 | 199 |
}else {
|
| ... | ... | |
| 311 | 311 |
} |
| 312 | 312 |
|
| 313 | 313 |
// --- Reference.authorship --- // |
| 314 |
if(authorTeam != null && reference != null){
|
|
| 314 |
if(authorship != null && reference != null){
|
|
| 315 | 315 |
if(elementNameToStore.equals("String")){
|
| 316 |
authorTeam.addTeamMember(Person.NewTitledInstance(trimmedText));
|
|
| 316 |
authorship.addTeamMember(Person.NewTitledInstance(trimmedText));
|
|
| 317 | 317 |
} |
| 318 | 318 |
} |
| 319 | 319 |
|
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx2013/TaxonXModsExtractor.java | ||
|---|---|---|
| 178 | 178 |
ref.setAuthorship(persons.get(0)); |
| 179 | 179 |
} |
| 180 | 180 |
else{
|
| 181 |
Team authorTeam = Team.NewInstance();
|
|
| 181 |
Team authorship = Team.NewInstance();
|
|
| 182 | 182 |
for (Person pers:persons){
|
| 183 |
authorTeam.addTeamMember(pers);
|
|
| 183 |
authorship.addTeamMember(pers);
|
|
| 184 | 184 |
} |
| 185 | 185 |
|
| 186 |
if (!personMap.containsKey(authorTeam.getTitleCache()) && (authorTeam.getTeamMembers().size()>0)){
|
|
| 187 |
UUID uuid = importer.getAgentService().saveOrUpdate(authorTeam);
|
|
| 188 |
personMap.put(authorTeam.getTitleCache(),uuid);
|
|
| 186 |
if (!personMap.containsKey(authorship.getTitleCache()) && (authorship.getTeamMembers().size()>0)){
|
|
| 187 |
UUID uuid = importer.getAgentService().saveOrUpdate(authorship);
|
|
| 188 |
personMap.put(authorship.getTitleCache(),uuid);
|
|
| 189 | 189 |
}else{
|
| 190 |
if(authorTeam.getTeamMembers().size()>1) {
|
|
| 191 |
UUID uuid = personMap.get(authorTeam.getTitleCache());
|
|
| 192 |
authorTeam = (Team) importer.getAgentService().find(uuid);
|
|
| 190 |
if(authorship.getTeamMembers().size()>1) {
|
|
| 191 |
UUID uuid = personMap.get(authorship.getTitleCache());
|
|
| 192 |
authorship = (Team) importer.getAgentService().find(uuid);
|
|
| 193 | 193 |
} |
| 194 | 194 |
} |
| 195 | 195 |
|
| 196 |
ref.setAuthorship(authorTeam);
|
|
| 196 |
ref.setAuthorship(authorship);
|
|
| 197 | 197 |
} |
| 198 | 198 |
if (editors.size()>0) {
|
| 199 | 199 |
ref.setEditor(StringUtils.join(editors,", ")); |
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfReferenceImport.java | ||
|---|---|---|
| 238 | 238 |
tcsNamespace = publicationNamespace; |
| 239 | 239 |
String strAuthorship = elPublicationCitation.getChildText(tcsElementName, tcsNamespace); |
| 240 | 240 |
//TODO |
| 241 |
TeamOrPersonBase<?> authorTeam = Team.NewInstance();
|
|
| 242 |
authorTeam.setTitleCache(strAuthorship, true);
|
|
| 243 |
ref.setAuthorTeam(authorTeam);
|
|
| 241 |
TeamOrPersonBase<?> authorship = Team.NewInstance();
|
|
| 242 |
authorship.setTitleCache(strAuthorship, true);
|
|
| 243 |
ref.setAuthorship(authorship);
|
|
| 244 | 244 |
|
| 245 | 245 |
tcsElementName = "year"; |
| 246 | 246 |
tcsNamespace = publicationNamespace; |
| cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/excel/stream/ExcelStreamImportTest.java | ||
|---|---|---|
| 228 | 228 |
// Reference ref = source.getCitation(); |
| 229 | 229 |
// assertNotNull("Citation should not be null", ref);
|
| 230 | 230 |
// assertNotNull("Authorship should not be null", ref.getAuthorship());
|
| 231 |
// assertEquals("Source author should be 'Meyer et. al.'", "Meyer et. al.",ref.getAuthorTeam().getTitleCache());
|
|
| 231 |
// assertEquals("Source author should be 'Meyer et. al.'", "Meyer et. al.",ref.getAuthorship().getTitleCache());
|
|
| 232 | 232 |
// assertEquals("Publication title should be 'My first book'", "My first book", ref.getTitle());
|
| 233 | 233 |
// assertEquals("Publication year should be '1987'", "1987", ref.getYear());
|
| 234 | 234 |
// TaxonNameBase nameUsedInSource = source.getNameUsedInSource(); |
| ... | ... | |
| 252 | 252 |
// ref = source.getCitation(); |
| 253 | 253 |
// assertNotNull("Citation should not be null", ref);
|
| 254 | 254 |
// assertNotNull("Authorship should not be null", ref.getAuthorship());
|
| 255 |
// assertEquals("Source author should be 'Theys, A.'", "Theys, A.",ref.getAuthorTeam().getTitleCache());
|
|
| 255 |
// assertEquals("Source author should be 'Theys, A.'", "Theys, A.",ref.getAuthorship().getTitleCache());
|
|
| 256 | 256 |
// assertEquals("Publication title should be 'The ultimate book'", "The ultimate book", ref.getTitle());
|
| 257 | 257 |
// assertEquals("Publication year should be '2011'", "2011", ref.getYear());
|
| 258 | 258 |
// nameUsedInSource = source.getNameUsedInSource(); |
| cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/jaxb/ReferenceTest.xml | ||
|---|---|---|
| 27 | 27 |
<common:TitleCache>Godfray, 2002</common:TitleCache> |
| 28 | 28 |
<common:ProtectedTitleCache>false</common:ProtectedTitleCache> |
| 29 | 29 |
<reference:IsNomenclaturallyRelevant>false</reference:IsNomenclaturallyRelevant> |
| 30 |
<reference:AuthorTeam>urn-uuid-1a634162-4db8-4d83-84b0-079730d73c51</reference:AuthorTeam>
|
|
| 30 |
<reference:Authorship>urn-uuid-1a634162-4db8-4d83-84b0-079730d73c51</reference:Authorship>
|
|
| 31 | 31 |
<reference:Title>Challenges for taxonomy</reference:Title> |
| 32 | 32 |
<reference:Volume>417</reference:Volume> |
| 33 | 33 |
<reference:Pages>17-19</reference:Pages> |
| ... | ... | |
| 52 | 52 |
<common:TitleCache>Darwin, 1859</common:TitleCache> |
| 53 | 53 |
<common:ProtectedTitleCache>false</common:ProtectedTitleCache> |
| 54 | 54 |
<reference:IsNomenclaturallyRelevant>false</reference:IsNomenclaturallyRelevant> |
| 55 |
<reference:AuthorTeam>urn-uuid-b8506159-0555-4489-a74c-eb50c2062218</reference:AuthorTeam>
|
|
| 55 |
<reference:Authorship>urn-uuid-b8506159-0555-4489-a74c-eb50c2062218</reference:Authorship>
|
|
| 56 | 56 |
<reference:Title>On the Origin of Species by Means of Natural Selection, or the Preservation of Favoured Races in the Struggle for Life</reference:Title> |
| 57 | 57 |
<reference:DatePublished> |
| 58 | 58 |
<common:Start>1859-11-24</common:Start> |
| ... | ... | |
| 63 | 63 |
<common:TitleCache>Darwin, 2005</common:TitleCache> |
| 64 | 64 |
<common:ProtectedTitleCache>false</common:ProtectedTitleCache> |
| 65 | 65 |
<reference:IsNomenclaturallyRelevant>false</reference:IsNomenclaturallyRelevant> |
| 66 |
<reference:AuthorTeam>urn-uuid-b8506159-0555-4489-a74c-eb50c2062218</reference:AuthorTeam>
|
|
| 66 |
<reference:Authorship>urn-uuid-b8506159-0555-4489-a74c-eb50c2062218</reference:Authorship>
|
|
| 67 | 67 |
<reference:Title>From So Simple a Beginning: Darwin's Four Great Books (Voyage of the H.M.S. Beagle, The Origin of Species, The Descent of Man, The Expression of Emotions in Man and Animals)</reference:Title> |
| 68 | 68 |
<reference:DatePublished> |
| 69 | 69 |
<common:Start>2005-11</common:Start> |
| cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/jaxb/TaxonNameTest.xml | ||
|---|---|---|
| 199 | 199 |
<common:TitleCache>Linnaeus, 1758</common:TitleCache> |
| 200 | 200 |
<common:ProtectedTitleCache>false</common:ProtectedTitleCache> |
| 201 | 201 |
<reference:IsNomenclaturallyRelevant>true</reference:IsNomenclaturallyRelevant> |
| 202 |
<reference:AuthorTeam>urn-uuid-5d3161eb-d227-415f-ba2a-93b8c7ddb98a</reference:AuthorTeam>
|
|
| 202 |
<reference:Authorship>urn-uuid-5d3161eb-d227-415f-ba2a-93b8c7ddb98a</reference:Authorship>
|
|
| 203 | 203 |
<reference:Title>Syst. Nat. (Edn 10)</reference:Title> |
| 204 | 204 |
<reference:DatePublished> |
| 205 | 205 |
<common:Start>1758</common:Start> |
| ... | ... | |
| 212 | 212 |
<common:TitleCache>Linnaeus, 1753</common:TitleCache> |
| 213 | 213 |
<common:ProtectedTitleCache>false</common:ProtectedTitleCache> |
| 214 | 214 |
<reference:IsNomenclaturallyRelevant>true</reference:IsNomenclaturallyRelevant> |
| 215 |
<reference:AuthorTeam>urn-uuid-5d3161eb-d227-415f-ba2a-93b8c7ddb98a</reference:AuthorTeam>
|
|
| 215 |
<reference:Authorship>urn-uuid-5d3161eb-d227-415f-ba2a-93b8c7ddb98a</reference:Authorship>
|
|
| 216 | 216 |
<reference:Title>Species Plantarum</reference:Title> |
| 217 | 217 |
<reference:DatePublished> |
| 218 | 218 |
<common:Start>1753</common:Start> |
| ... | ... | |
| 224 | 224 |
<common:TitleCache>Schott, 1856</common:TitleCache> |
| 225 | 225 |
<common:ProtectedTitleCache>false</common:ProtectedTitleCache> |
| 226 | 226 |
<reference:IsNomenclaturallyRelevant>true</reference:IsNomenclaturallyRelevant> |
| 227 |
<reference:AuthorTeam>urn-uuid-28e67c60-ca40-41bb-aa1c-f713efd0f235</reference:AuthorTeam>
|
|
| 227 |
<reference:Authorship>urn-uuid-28e67c60-ca40-41bb-aa1c-f713efd0f235</reference:Authorship>
|
|
| 228 | 228 |
<reference:Title>Synopsis aroidearum complectens enumerationem sytematicam generum et ...</reference:Title> |
| 229 | 229 |
<reference:DatePublished> |
| 230 | 230 |
<common:Start>1856</common:Start> |
| ... | ... | |
| 236 | 236 |
<common:TitleCache>Tutt, 1904</common:TitleCache> |
| 237 | 237 |
<common:ProtectedTitleCache>false</common:ProtectedTitleCache> |
| 238 | 238 |
<reference:IsNomenclaturallyRelevant>true</reference:IsNomenclaturallyRelevant> |
| 239 |
<reference:AuthorTeam>urn-uuid-b8cd17ba-32ea-4201-85f1-63d31526ccdb</reference:AuthorTeam>
|
|
| 239 |
<reference:Authorship>urn-uuid-b8cd17ba-32ea-4201-85f1-63d31526ccdb</reference:Authorship>
|
|
| 240 | 240 |
<reference:Title>A Natural History of the British Lepidoptera</reference:Title> |
| 241 | 241 |
<reference:DatePublished> |
| 242 | 242 |
<common:Start>1904</common:Start> |
| ... | ... | |
| 248 | 248 |
<common:TitleCache>Kitching & Cadiou, 2000</common:TitleCache> |
| 249 | 249 |
<common:ProtectedTitleCache>true</common:ProtectedTitleCache> |
| 250 | 250 |
<reference:IsNomenclaturallyRelevant>true</reference:IsNomenclaturallyRelevant> |
| 251 |
<reference:AuthorTeam>urn-uuid-cb525bcb-3736-4fda-91f1-13dceb64466c</reference:AuthorTeam>
|
|
| 251 |
<reference:Authorship>urn-uuid-cb525bcb-3736-4fda-91f1-13dceb64466c</reference:Authorship>
|
|
| 252 | 252 |
<reference:Title>Hawkmoths of the World: An Annotated and Illustrated Revisionary Checklist</reference:Title> |
| 253 | 253 |
<reference:DatePublished> |
| 254 | 254 |
<common:Start>2000</common:Start> |
| cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/jaxb/TaxonTest.xml | ||
|---|---|---|
| 46 | 46 |
<common:TitleCache>Laspeyres, 1809</common:TitleCache> |
| 47 | 47 |
<common:ProtectedTitleCache>false</common:ProtectedTitleCache> |
| 48 | 48 |
<reference:IsNomenclaturallyRelevant>true</reference:IsNomenclaturallyRelevant> |
| 49 |
<reference:AuthorTeam>urn-uuid-73b1c67a-b61a-4e6a-96fc-b6568c08542f</reference:AuthorTeam>
|
|
| 49 |
<reference:Authorship>urn-uuid-73b1c67a-b61a-4e6a-96fc-b6568c08542f</reference:Authorship>
|
|
| 50 | 50 |
<reference:Title>Jena. allg. Lit.-Ztg</reference:Title> |
| 51 | 51 |
<reference:DatePublished> |
| 52 | 52 |
<common:Start>1809</common:Start> |
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java | ||
|---|---|---|
| 75 | 75 |
@XmlElement(name = "ProtectedNomenclaturalTitleCache") |
| 76 | 76 |
private boolean protectedNomenclaturalTitleCache = false; |
| 77 | 77 |
|
| 78 |
//An abbreviated name for the team (e. g. in case of nomenclatural authorteams). A non abbreviated name for the team (e. g. |
|
| 78 |
//An abbreviated name for the team (e. g. in case of nomenclatural authorteams). |
|
| 79 |
//A non abbreviated name for the team (e. g. |
|
| 79 | 80 |
//in case of some bibliographical references) |
| 80 | 81 |
@XmlElementWrapper(name = "TeamMembers", nillable = true) |
| 81 | 82 |
@XmlElement(name = "TeamMember") |
| cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmGenericDaoImplTest.java | ||
|---|---|---|
| 612 | 612 |
article1.addMedia(media1); |
| 613 | 613 |
article2.addMedia(media2); |
| 614 | 614 |
|
| 615 |
// ref1.setAuthorTeam(author);
|
|
| 615 |
// ref1.setAuthorship(author);
|
|
| 616 | 616 |
// name1.setBasionymAuthorTeam(author); |
| 617 | 617 |
|
| 618 | 618 |
name1.setNomenclaturalReference(article1); |
| cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/hibernate/replace/ReferringObjectMetadataFactoryTest.testReplaceToOneProperty-result.xml | ||
|---|---|---|
| 12 | 12 |
<AGENTBASE_AGENTBASE AGENTBASE_ID="6" TEAMMEMBERS_ID="3" SORTINDEX="0"/> |
| 13 | 13 |
<AGENTBASE_AGENTBASE AGENTBASE_ID="6" TEAMMEMBERS_ID="4" SORTINDEX="1"/> |
| 14 | 14 |
<AGENTBASE_AGENTBASE AGENTBASE_ID="6" TEAMMEMBERS_ID="5" SORTINDEX="2"/> |
| 15 |
<REFERENCE ID="1" UUID="596b1325-be50-4b0a-9aa2-3ecd610215f2" PROTECTEDTITLECACHE="true" TITLECACHE="Lorem ipsum" PROTECTEDABBREVTITLECACHE="false" ABBREVTITLECACHE="Sp. Pl." ABBREVTITLE="Sp. Pl." NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" REFTYPE="BK"/> <!--AUTHORTEAM_ID="1"-->
|
|
| 15 |
<REFERENCE ID="1" UUID="596b1325-be50-4b0a-9aa2-3ecd610215f2" PROTECTEDTITLECACHE="true" TITLECACHE="Lorem ipsum" PROTECTEDABBREVTITLECACHE="false" ABBREVTITLECACHE="Sp. Pl." ABBREVTITLE="Sp. Pl." NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" REFTYPE="BK"/> <!--AUTHORSHIP_ID="1"-->
|
|
| 16 | 16 |
<REFERENCE ID="2" CREATED="2008-12-10 09:56:07.0" UUID="ad4322b7-4b05-48af-be70-f113e46c545e" UPDATED="2008-12-10 09:56:07.253" PROTECTEDTITLECACHE="true" TITLECACHE="cate-sphingidae.org" PROTECTEDABBREVTITLECACHE="false" ABBREVTITLECACHE="cate-sphingidae.org" ABBREVTITLE="cate-sphingidae.org" NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" AUTHORSHIP_ID="3" REFTYPE="DB"/> |
| 17 | 17 |
<REFERENCE ID="3" CREATED="2008-12-10 09:56:07.0" UUID="3eea6f96-0682-4025-8cdd-aaaf7c915ae2" UPDATED="2008-12-10 09:56:07.253" PROTECTEDTITLECACHE="true" TITLECACHE="cate-araceae.org" PROTECTEDABBREVTITLECACHE="false" ABBREVTITLECACHE="cate-araceae.org" ABBREVTITLE="cate-araceae.org" NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" REFTYPE="DB"/> |
| 18 | 18 |
<TAXONNAMEBASE DTYPE="BotanicalName" ID="1" CREATED="2008-12-10 09:56:07.0" UUID="a49a3963-c4ea-4047-8588-2f8f15352730" PROTECTEDTITLECACHE="true" TITLECACHE="" FULLTITLECACHE="" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="true" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="Aus" HYBRIDFORMULA="false" MONOMHYBRID="false" NAMECACHE="Aus" PROTECTEDAUTHORSHIPCACHE="true" PROTECTEDNAMECACHE="true" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="1" NOMENCLATURALREFERENCE_ID="1" RANK_ID="774" BASIONYMAUTHORTEAM_ID="1" COMBINATIONAUTHORTEAM_ID="1"/> |
| cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/hibernate/replace/ReferringObjectMetadataFactoryTest.xml | ||
|---|---|---|
| 55 | 55 |
<HYBRIDRELATIONSHIP ID="2" CREATED="2008-12-10 09:56:07.0" UUID="bb186839-3c46-4c6e-b58b-b530f25c0b11" UPDATED="2008-12-10 09:56:07.253" RELATEDFROM_ID="40" RELATEDTO_ID="38" TYPE_ID="851" DOUBTFUL="false"/> |
| 56 | 56 |
<NAMERELATIONSHIP ID="1" CREATED="2008-12-10 09:56:07.0" UUID="331c93a6-eabc-4a32-9a26-351aaff8dfbd" UPDATED="2008-12-10 09:56:07.253" RELATEDFROM_ID="15" RELATEDTO_ID="27" TYPE_ID="857" DOUBTFUL="false"/> |
| 57 | 57 |
<NAMERELATIONSHIP ID="2" CREATED="2008-12-10 09:56:07.0" UUID="331c93a6-eaac-4a32-9a26-351aaff8dfbd" UPDATED="2008-12-10 09:56:07.253" RELATEDFROM_ID="14" RELATEDTO_ID="27" TYPE_ID="857" DOUBTFUL="false"/> |
| 58 |
<REFERENCE ID="1" UUID="596b1325-be50-4b0a-9aa2-3ecd610215f2" PROTECTEDTITLECACHE="true" TITLECACHE="Lorem ipsum" PROTECTEDABBREVTITLECACHE="false" ABBREVTITLECACHE="Sp. Pl." ABBREVTITLE="Sp. Pl." NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" REFTYPE="BK"/> <!--AUTHORTEAM_ID="1"-->
|
|
| 58 |
<REFERENCE ID="1" UUID="596b1325-be50-4b0a-9aa2-3ecd610215f2" PROTECTEDTITLECACHE="true" TITLECACHE="Lorem ipsum" PROTECTEDABBREVTITLECACHE="false" ABBREVTITLECACHE="Sp. Pl." ABBREVTITLE="Sp. Pl." NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" REFTYPE="BK"/> <!--AUTHORSHIP_ID="1"-->
|
|
| 59 | 59 |
<REFERENCE ID="2" CREATED="2008-12-10 09:56:07.0" UUID="ad4322b7-4b05-48af-be70-f113e46c545e" UPDATED="2008-12-10 09:56:07.253" PROTECTEDTITLECACHE="true" TITLECACHE="cate-sphingidae.org" PROTECTEDABBREVTITLECACHE="false" ABBREVTITLECACHE="cate-sphingidae.org" ABBREVTITLE="cate-sphingidae.org" NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" AUTHORSHIP_ID="3" REFTYPE="DB"/> |
| 60 | 60 |
<REFERENCE ID="3" CREATED="2008-12-10 09:56:07.0" UUID="3eea6f96-0682-4025-8cdd-aaaf7c915ae2" UPDATED="2008-12-10 09:56:07.253" PROTECTEDTITLECACHE="true" TITLECACHE="cate-araceae.org" PROTECTEDABBREVTITLECACHE="false" ABBREVTITLECACHE="cate-araceae.org" ABBREVTITLE="cate-araceae.org" NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" REFTYPE="DB"/> |
| 61 | 61 |
<SPECIMENOROBSERVATIONBASE DTYPE="DerivedUnit" RECORDBASIS="PS" ID="1" CREATED="2008-12-10 09:56:07.0" UUID="50a276c0-4df9-4da3-8b18-b4d2f82aa9b4" UPDATED="2008-12-10 09:56:07.238" TITLECACHE="Lorem ipsum" PROTECTEDTITLECACHE="true"/> |
| cdmlib-print/src/main/resources/stylesheets/mediawiki/multipages.xsl | ||
|---|---|---|
| 345 | 345 |
<!-- first of all check if any of the data we show exist: TODO remove this |
| 346 | 346 |
test, if we modified CDM services, to export proper data --> |
| 347 | 347 |
<xsl:if |
| 348 |
test="exists($reference-node/authorTeam/teamMembers/e[1]/lastname)
|
|
| 349 |
or exists($reference-node/authorTeam/lastname) or exists($reference-node/datePublished/start)
|
|
| 348 |
test="exists($reference-node/authorship/teamMembers/e[1]/lastname)
|
|
| 349 |
or exists($reference-node/authorship/lastname) or exists($reference-node/datePublished/start)
|
|
| 350 | 350 |
or exists($reference-node/title)"> |
| 351 | 351 |
|
| 352 | 352 |
<!-- use the citation-uuid as a unique name for the reference --> |
| ... | ... | |
| 357 | 357 |
select="concat('{{EDIT_Reference|name=',$citation-uuid,'|content=')" />
|
| 358 | 358 |
|
| 359 | 359 |
<xsl:choose> |
| 360 |
<xsl:when test="exists($reference-node/authorTeam/teamMembers)">
|
|
| 360 |
<xsl:when test="exists($reference-node/authorship/teamMembers)">
|
|
| 361 | 361 |
<xsl:text>{{aut|</xsl:text>
|
| 362 |
<xsl:for-each select="$reference-node/authorTeam/teamMembers/e">
|
|
| 362 |
<xsl:for-each select="$reference-node/authorship/teamMembers/e">
|
|
| 363 | 363 |
<xsl:value-of select="lastname" /> |
| 364 | 364 |
<xsl:choose> |
| 365 | 365 |
<xsl:when test="position() != last()"> |
| ... | ... | |
| 371 | 371 |
</xsl:when> |
| 372 | 372 |
<xsl:otherwise> |
| 373 | 373 |
<xsl:choose> |
| 374 |
<xsl:when test="exists($reference-node/authorTeam/lastname)">
|
|
| 374 |
<xsl:when test="exists($reference-node/authorship/lastname)">
|
|
| 375 | 375 |
<xsl:text>{{aut|</xsl:text>
|
| 376 |
<xsl:value-of select="$reference-node/authorTeam/lastname" />
|
|
| 376 |
<xsl:value-of select="$reference-node/authorship/lastname" />
|
|
| 377 | 377 |
<xsl:text>}} </xsl:text> |
| 378 | 378 |
</xsl:when> |
| 379 | 379 |
<xsl:otherwise> |
| cdmlib-print/src/main/resources/stylesheets/pdf/caryophyllales.xsl | ||
|---|---|---|
| 1195 | 1195 |
<xsl:sort select="sources/e[1]/citation/datePublished/start"/> |
| 1196 | 1196 |
<xsl:for-each select="sources/e"> |
| 1197 | 1197 |
|
| 1198 |
<xsl:variable name="lastname_text" select="citation/authorTeam/lastname"/>
|
|
| 1199 |
<xsl:variable name="prev_lastname_text" select="preceding-sibling::e[1]/citation/authorTeam/lastname"/>
|
|
| 1198 |
<xsl:variable name="lastname_text" select="citation/authorship/lastname"/>
|
|
| 1199 |
<xsl:variable name="prev_lastname_text" select="preceding-sibling::e[1]/citation/authorship/lastname"/>
|
|
| 1200 | 1200 |
|
| 1201 | 1201 |
<xsl:if test="nameUsedInSource/uuid=$name-uuid"> |
| 1202 | 1202 |
<xsl:text>; </xsl:text> |
| 1203 | 1203 |
<fo:inline> |
| 1204 |
<!--xsl:value-of select="citation/authorTeam/titleCache"/-->
|
|
| 1204 |
<!--xsl:value-of select="citation/authorship/titleCache"/-->
|
|
| 1205 | 1205 |
<!--TODO wrap this in a variable and compare the previous variable to this one to see if we're dealing with the same name--> |
| 1206 |
<xsl:for-each select="citation/authorTeam/teamMembers/e">
|
|
| 1206 |
<xsl:for-each select="citation/authorship/teamMembers/e">
|
|
| 1207 | 1207 |
<xsl:value-of select="lastname"/> |
| 1208 | 1208 |
<xsl:choose> |
| 1209 | 1209 |
<xsl:when test="position() != last()"> |
| ... | ... | |
| 1214 | 1214 |
|
| 1215 | 1215 |
<xsl:choose> |
| 1216 | 1216 |
<xsl:when test="$lastname_text != $prev_lastname_text"> |
| 1217 |
<xsl:value-of select="citation/authorTeam/lastname"/><!--TODO We print lastname here as well as the author list is this a mistake?-->
|
|
| 1217 |
<xsl:value-of select="citation/authorship/lastname"/><!--TODO We print lastname here as well as the author list is this a mistake?-->
|
|
| 1218 | 1218 |
|
| 1219 | 1219 |
<xsl:text> (</xsl:text> |
| 1220 | 1220 |
<xsl:value-of select="citation/datePublished/start"/> |
| ... | ... | |
| 1250 | 1250 |
<xsl:if test="nameUsedInSource/uuid=$name-uuid"> |
| 1251 | 1251 |
<xsl:text>; </xsl:text> |
| 1252 | 1252 |
<fo:inline> |
| 1253 |
<!--xsl:value-of select="citation/authorTeam/titleCache"/-->
|
|
| 1254 |
<xsl:for-each select="citation/authorTeam/teamMembers/e">
|
|
| 1253 |
<!--xsl:value-of select="citation/authorship/titleCache"/-->
|
|
| 1254 |
<xsl:for-each select="citation/authorship/teamMembers/e">
|
|
| 1255 | 1255 |
<xsl:value-of select="lastname"/> |
| 1256 | 1256 |
<xsl:choose> |
| 1257 | 1257 |
<xsl:when test="position() != last()"> |
| ... | ... | |
| 1260 | 1260 |
</xsl:choose> |
| 1261 | 1261 |
</xsl:for-each> |
| 1262 | 1262 |
|
| 1263 |
<xsl:value-of select="citation/authorTeam/lastname"/>
|
|
| 1263 |
<xsl:value-of select="citation/authorship/lastname"/>
|
|
| 1264 | 1264 |
<xsl:text> (</xsl:text> |
| 1265 | 1265 |
<xsl:value-of select="citation/datePublished/start"/> |
| 1266 | 1266 |
<xsl:text>: </xsl:text> |
| ... | ... | |
| 1379 | 1379 |
|
| 1380 | 1380 |
<xsl:template name="Referencesold"> |
| 1381 | 1381 |
|
| 1382 |
<!-- need to sort by lastname of the first author i.e. //citation/authorTeam/teamMembers/e[1]/lastname -->
|
|
| 1382 |
<!-- need to sort by lastname of the first author i.e. //citation/authorship/teamMembers/e[1]/lastname -->
|
|
| 1383 | 1383 |
<xsl:for-each select="//citation"> |
| 1384 | 1384 |
|
| 1385 | 1385 |
<!-- TODO sorting only works for the first citation, implement correctly --> |
| cdmlib-print/src/main/resources/stylesheets/pdf/flore-afrique-centrale.xsl | ||
|---|---|---|
| 1226 | 1226 |
<xsl:sort select="sources/e[1]/citation/datePublished/start"/> |
| 1227 | 1227 |
<xsl:for-each select="sources/e"> |
| 1228 | 1228 |
|
| 1229 |
<xsl:variable name="lastname_text" select="citation/authorTeam/lastname"/>
|
|
| 1230 |
<xsl:variable name="prev_lastname_text" select="preceding-sibling::e[1]/citation/authorTeam/lastname"/>
|
|
| 1229 |
<xsl:variable name="lastname_text" select="citation/authorship/lastname"/>
|
|
| 1230 |
<xsl:variable name="prev_lastname_text" select="preceding-sibling::e[1]/citation/authorship/lastname"/>
|
|
| 1231 | 1231 |
|
| 1232 | 1232 |
<xsl:if test="nameUsedInSource/uuid=$name-uuid"> |
| 1233 | 1233 |
<xsl:text>; </xsl:text> |
| 1234 | 1234 |
<fo:inline> |
| 1235 |
<!--xsl:value-of select="citation/authorTeam/titleCache"/-->
|
|
| 1235 |
<!--xsl:value-of select="citation/authorship/titleCache"/-->
|
|
| 1236 | 1236 |
<!--TODO wrap this in a variable and compare the previous variable to this one to see if we're dealing with the same name--> |
| 1237 |
<xsl:for-each select="citation/authorTeam/teamMembers/e">
|
|
| 1237 |
<xsl:for-each select="citation/authorship/teamMembers/e">
|
|
| 1238 | 1238 |
<xsl:value-of select="lastname"/> |
| 1239 | 1239 |
<xsl:choose> |
| 1240 | 1240 |
<xsl:when test="position() != last()"> |
| ... | ... | |
| 1245 | 1245 |
|
| 1246 | 1246 |
<xsl:choose> |
| 1247 | 1247 |
<xsl:when test="$lastname_text != $prev_lastname_text"> |
| 1248 |
<xsl:value-of select="citation/authorTeam/lastname"/><!--TODO We print lastname here as well as the author list is this a mistake?-->
|
|
| 1248 |
<xsl:value-of select="citation/authorship/lastname"/><!--TODO We print lastname here as well as the author list is this a mistake?-->
|
|
| 1249 | 1249 |
|
| 1250 | 1250 |
<xsl:text> (</xsl:text> |
| 1251 | 1251 |
<xsl:value-of select="citation/datePublished/start"/> |
| ... | ... | |
| 1283 | 1283 |
<xsl:if test="nameUsedInSource/uuid=$name-uuid"> |
| 1284 | 1284 |
<xsl:text>; </xsl:text> |
| 1285 | 1285 |
<fo:inline> |
| 1286 |
<!--xsl:value-of select="citation/authorTeam/titleCache"/-->
|
|
| 1287 |
<xsl:for-each select="citation/authorTeam/teamMembers/e">
|
|
| 1286 |
<!--xsl:value-of select="citation/authorship/titleCache"/-->
|
|
| 1287 |
<xsl:for-each select="citation/authorship/teamMembers/e">
|
|
| 1288 | 1288 |
<xsl:value-of select="lastname"/> |
| 1289 | 1289 |
<xsl:choose> |
| 1290 | 1290 |
<xsl:when test="position() != last()"> |
| ... | ... | |
| 1293 | 1293 |
</xsl:choose> |
| 1294 | 1294 |
</xsl:for-each> |
| 1295 | 1295 |
|
| 1296 |
<xsl:value-of select="citation/authorTeam/lastname"/>
|
|
| 1296 |
<xsl:value-of select="citation/authorship/lastname"/>
|
|
| 1297 | 1297 |
<xsl:text> (</xsl:text> |
| 1298 | 1298 |
<xsl:value-of select="citation/datePublished/start"/> |
| 1299 | 1299 |
<xsl:text>: </xsl:text> |
| ... | ... | |
| 1434 | 1434 |
|
| 1435 | 1435 |
<xsl:template name="Referencesold"> |
| 1436 | 1436 |
|
| 1437 |
<!-- need to sort by lastname of the first author i.e. //citation/authorTeam/teamMembers/e[1]/lastname -->
|
|
| 1437 |
<!-- need to sort by lastname of the first author i.e. //citation/authorship/teamMembers/e[1]/lastname -->
|
|
| 1438 | 1438 |
<xsl:for-each select="//citation"> |
| 1439 | 1439 |
|
| 1440 | 1440 |
<!-- TODO sorting only works for the first citation, implement correctly --> |
| cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ReferenceController.java | ||
|---|---|---|
| 52 | 52 |
"inReference.authorship" |
| 53 | 53 |
}); |
| 54 | 54 |
|
| 55 |
private static final List<String> CITATION_WITH_AUTHORTEAM_INIT_STRATEGY = Arrays.asList(new String []{
|
|
| 55 |
private static final List<String> CITATION_WITH_AUTHORSHIP_INIT_STRATEGY = Arrays.asList(new String []{
|
|
| 56 | 56 |
"authorship.$" |
| 57 | 57 |
}); |
| 58 | 58 |
|
| ... | ... | |
| 103 | 103 |
@RequestMapping( |
| 104 | 104 |
value = {"authorship"},
|
| 105 | 105 |
method = RequestMethod.GET) |
| 106 |
public ModelAndView doGetAuthorTeam(
|
|
| 106 |
public ModelAndView doGetAuthorship(
|
|
| 107 | 107 |
@PathVariable("uuid") UUID uuid,
|
| 108 | 108 |
HttpServletRequest request, |
| 109 | 109 |
HttpServletResponse response) {
|
| 110 | 110 |
ModelAndView mv = new ModelAndView(); |
| 111 |
Reference rb = service.load(uuid, CITATION_WITH_AUTHORTEAM_INIT_STRATEGY);
|
|
| 111 |
Reference rb = service.load(uuid, CITATION_WITH_AUTHORSHIP_INIT_STRATEGY);
|
|
| 112 | 112 |
if(rb.getAuthorship() != null){
|
| 113 | 113 |
mv.addObject(rb.getAuthorship()); |
| 114 | 114 |
} |
| cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/dto/oaipmh/mappings.xml | ||
|---|---|---|
| 67 | 67 |
<b>date</b> |
| 68 | 68 |
</field> |
| 69 | 69 |
<field custom-converter-id="hibernateProxyDeepConverter" custom-converter-param="titleCache" > |
| 70 |
<a>authorTeam</a>
|
|
| 70 |
<a>authorship</a>
|
|
| 71 | 71 |
<b>creator</b> |
| 72 | 72 |
</field> |
| 73 | 73 |
<field> |
| cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/dto/assembler/lsid/AssemblerTest.java | ||
|---|---|---|
| 178 | 178 |
bookSection.setReferenceAbstract("referenceAbstract");
|
| 179 | 179 |
bookSection.setUri(new URI("http://persitent.books.foo/myBookSection"));
|
| 180 | 180 |
bookSection.setUuid(UUID.randomUUID()); |
| 181 |
bookSection.addCredit(Credit.NewInstance(authorship, "Credits to the authorTeam"));
|
|
| 181 |
bookSection.addCredit(Credit.NewInstance(authorship, "Credits to the authorship"));
|
|
| 182 | 182 |
bookSection.addSource(IdentifiableSource.NewDataImportInstance("http://persitent.IdentifiableSources.foo/2"));
|
| 183 | 183 |
} |
| 184 | 184 |
|
Also available in: Unified diff
rename Reference.authorTeam -> authorship #4432