diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000000000000000000000000000000000000..b7de6e186bd02935030f5d42867ea7043fb1c27c --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,165 @@ +GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + + +This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + +0. Additional Definitions. + +As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + +"The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + +An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + +A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + +The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + +The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + +1. Exception to Section 3 of the GNU GPL. + +You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + +2. Conveying Modified Versions. + +If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + +a) under this License, provided that you make a good faith effort to +ensure that, in the event an Application does not supply the +function or data, the facility still operates, and performs +whatever part of its purpose remains meaningful, or + +b) under the GNU GPL, with none of the additional permissions of +this License applicable to that copy. + +3. Object Code Incorporating Material from Library Header Files. + +The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + +a) Give prominent notice with each copy of the object code that the +Library is used in it and that the Library and its use are +covered by this License. + +b) Accompany the object code with a copy of the GNU GPL and this license +document. + +4. Combined Works. + +You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + +a) Give prominent notice with each copy of the Combined Work that +the Library is used in it and that the Library and its use are +covered by this License. + +b) Accompany the Combined Work with a copy of the GNU GPL and this license +document. + +c) For a Combined Work that displays copyright notices during +execution, include the copyright notice for the Library among +these notices, as well as a reference directing the user to the +copies of the GNU GPL and this license document. + +d) Do one of the following: + +0) Convey the Minimal Corresponding Source under the terms of this +License, and the Corresponding Application Code in a form +suitable for, and under terms that permit, the user to +recombine or relink the Application with a modified version of +the Linked Version to produce a modified Combined Work, in the +manner specified by section 6 of the GNU GPL for conveying +Corresponding Source. + +1) Use a suitable shared library mechanism for linking with the +Library. A suitable mechanism is one that (a) uses at run time +a copy of the Library already present on the user's computer +system, and (b) will operate properly with a modified version +of the Library that is interface-compatible with the Linked +Version. + +e) Provide Installation Information, but only if you would otherwise +be required to provide such information under section 6 of the +GNU GPL, and only to the extent that such information is +necessary to install and execute a modified version of the +Combined Work produced by recombining or relinking the +Application with a modified version of the Linked Version. (If +you use option 4d0, the Installation Information must accompany +the Minimal Corresponding Source and Corresponding Application +Code. If you use option 4d1, you must provide the Installation +Information in the manner specified by section 6 of the GNU GPL +for conveying Corresponding Source.) + +5. Combined Libraries. + +You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + +a) Accompany the combined library with a copy of the same work based +on the Library, uncombined with any other library facilities, +conveyed under the terms of this License. + +b) Give prominent notice with the combined library that part of it +is a work based on the Library, and explaining where to find the +accompanying uncombined form of the same work. + +6. Revised Versions of the GNU Lesser General Public License. + +The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + +If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/docs_dhrep/index.rst b/docs_dhrep/index.rst index e3a66bb249a0fa38e43d9f9ce1d36cd1b490caa5..c61d46e1a7aac0c358e2eb04039965426c337395 100644 --- a/docs_dhrep/index.rst +++ b/docs_dhrep/index.rst @@ -3,8 +3,6 @@ You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. -A PFD version of this DH-oaipmh Service Documentation you can find `HERE <./dhoaipmh_doc.pdf>`__. - DH-oaipmh Service ================= @@ -220,6 +218,6 @@ License See LICENCE_ -.. _LICENCE: ++lgpl++ +.. _LICENCE: https://projects.gwdg.de/projects/oai-pmh/repository/revisions/master/entry/LICENSE.txt .. _oaipmh_sources: https://projects.gwdg.de/projects/oai-pmh/repository -.. _oaipmh_bugtracking: https://projects.gwdg.de/projects/dariah-de-repository/work_packages?query_id=244 +.. _oaipmh_bugtracking: https://projects.gwdg.de/projects/dariah-de-repository/work_packages diff --git a/docs_tgrep/index.rst b/docs_tgrep/index.rst index f560b180ef7ad1c3dcdc9ecbc5c30d8f4e0bf14a..c42b06d2839e2b47f2dcdf83084c1d1bd941ee5b 100644 --- a/docs_tgrep/index.rst +++ b/docs_tgrep/index.rst @@ -24,9 +24,21 @@ API Documentation api/oai.rst -License +Sources ------- +See oaipmh_sources_ + + +Bugtracking +----------- +See oaipmh_bugtracking_ + +License +------- See LICENCE_ -.. _LICENCE: https://projects.gwdg.de/projects/oai-pmh/repository/revisions/master/raw/LICENSE.txt + +.. _LICENCE: https://projects.gwdg.de/projects/oai-pmh/repository/revisions/master/entry/LICENSE.txt +.. _oaipmh_sources: https://projects.gwdg.de/projects/oai-pmh/repository +.. _oaipmh_bugtracking: https://projects.gwdg.de/projects/tg/work_packages diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml index b72a067de27079c04885f914c8ee6f23279b4325..f016943331dea4cb95fafe6a41e5be6a1b7d4fd7 100644 --- a/oaipmh-core/pom.xml +++ b/oaipmh-core/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>oaipmh</artifactId> <groupId>info.textgrid.middleware</groupId> - <version>3.3.15</version> + <version>3.3.16</version> </parent> <groupId>info.textgrid.middleware</groupId> <artifactId>oaipmh-core</artifactId> diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java index 090d48b707d783c25903e870f6234853c8194046..c7be36a580bdb4a27532d830aa45300ab090eed6 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java @@ -66,7 +66,7 @@ public class SetDeliverer { .addField(this.formatField) .addField(this.identifierField) .addField("project.value") - .addField("project.id") + .addField("project.id") .setSize(100000); SearchResponse getRecordListItems = request.execute().actionGet(); @@ -132,7 +132,7 @@ public class SetDeliverer { return setList; } - + /** * <p> * Checking the request if all necessary values are set or not allowed values are not set. @@ -159,7 +159,6 @@ public class SetDeliverer { } return noArguments; } - /** * @return diff --git a/oaipmh-webapp/pom.xml b/oaipmh-webapp/pom.xml index 34351f735974e61f2bd2d0ca2259d8ad80a261e9..b8baaed17335e109728387cef59790d983cfac89 100644 --- a/oaipmh-webapp/pom.xml +++ b/oaipmh-webapp/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>oaipmh</artifactId> <groupId>info.textgrid.middleware</groupId> - <version>3.3.15</version> + <version>3.3.16</version> </parent> <groupId>info.textgrid.middleware</groupId> <artifactId>oaipmh-webapp</artifactId> diff --git a/pom.xml b/pom.xml index adca2288286c3dfd3827e426c280ae9719970160..a8e4ca91b69e91091f691b629213dfc6e3339d35 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>info.textgrid.middleware</groupId> <artifactId>oaipmh</artifactId> - <version>3.3.15</version> + <version>3.3.16</version> <packaging>pom</packaging> <name>DARIAHDE :: OAI-PMH DataProvider</name> <properties>