Merge pull request #985 from OPUS4/4.7.1.2

OPUS 4.7.1.2 Release
OPUS4 · Dec 13, 2022 · a669469 · a669469
2 parents e3453ac + 4067e57
commit a669469
Show file tree

Hide file tree

Showing 9 changed files with 190 additions and 13 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,10 @@
 # OPUS 4 Change Log
 
+## Release 4.7.1.2 - 2022-12-13
+
+* OPUS4/application#983 - Export von Suchtreffern ab 100 liefert leere Datei
+* OPUS4/application#978 - Ausgabe von GND-ID und ORCID iD in XMetaDissPlus
+
 ## Release 4.7.1.1 - 2022-07-12
 
 * OPUS4/application#598 - Werte für Konfigurationsparameter "supportedLanguages" trimmen

diff --git a/README.md b/README.md
@@ -7,9 +7,9 @@ redevelopment that was created as part of a DFG ([Deutsche Forschungsgemeinschaf
 Since then the development has been continued at KOBV ([Kooperativer Bibliotheksverbund Berlin-Brandenburg][KOBV])
 mostly.
 
-## OPUS 4.7.1 (current version)
+## OPUS 4.7.1.2 (current version)
 
-The current version of OPUS 4 is __4.7.1__. It is available on the [master][MASTER] branch. 
+The current version of OPUS 4 is __4.7.1.2__. It is available on the [master][MASTER] branch. 
 
 [Documentation][DOC]
 : Information on setting up a repository, for users and administrators.

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,15 @@
 # OPUS 4 Release Notes
 
+## Patch Release 4.7.1.2 - 2022-12-13
+
+ORCID und GND-ID werden jetzt in XMetaDissPlus für die Rollen `Author`,
+`Advisor`, `Referee` and `Editor` ausgegeben. 
+
+Ein Bug, der beim seitenweisen Export von Suchergebnissen unter Umständen
+für eine leere Export-Datei gesorgt hat, wurde beseitigt.
+
+--
+
 ## Patch Release 4.7.1.1 - 2022-07-12
 
 Die Sprachen im Konfigurationsparameter `supportedLanguages` werden nun 

diff --git a/application/configs/application.ini b/application/configs/application.ini
@@ -77,7 +77,7 @@ name = 'OPUS 4'
 logoLink = home
 security = 1
 workspacePath = APPLICATION_PATH "/workspace"
-version = 4.7.1.1
+version = 4.7.1.2
 update.latestVersionCheckUrl = "https://api.github.com/repos/opus4/application/releases/latest"
 
 ; base URL of your OPUS instance (used for generating absolute URLs, e.g. in email messages)

diff --git a/modules/export/models/XmlExport.php b/modules/export/models/XmlExport.php
@@ -301,6 +301,8 @@ public function prepareXml()
     /**
      * Returns maximum number of rows for export depending on autentication.
      *
+     * IMPORTANT: maxRows must not exceed 2147483647 (java,lang.Integer.MAX_VALUE)
+     *
      * @return int
      */
     public function getMaxRows()
@@ -323,6 +325,11 @@ public function getMaxRows()
             }
         }
 
+        // Do not allows configured values to exceed java.lang.Integer.MAX_VALUE (Solr)
+        if ($maxRows > Opus\Search\Util\Query::MAX_ROWS) {
+            $maxRows = Opus\Search\Util\Query::MAX_ROWS;
+        }
+
         return $maxRows;
     }
 

diff --git a/modules/oai/views/scripts/index/prefixes/XMetaDissPlus.xslt b/modules/oai/views/scripts/index/prefixes/XMetaDissPlus.xslt
@@ -59,7 +59,7 @@
     xmlns="http://www.d-nb.de/standards/subject/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:php="http://php.net/xsl"
-    xsi:schemaLocation="http://www.d-nb.de/standards/xmetadissplus/ http://files.dnb.de/standards/xmetadissplus/xmetadissplus.xsd"
+    xsi:schemaLocation="http://www.d-nb.de/standards/xmetadissplus/ https://d-nb.info/standards/schema/xmetadissplus.xsd"
     exclude-result-prefixes="php">
 
     <xsl:output method="xml" indent="yes" />
@@ -68,7 +68,7 @@
         <xMetaDiss:xMetaDiss
             xmlns:xMetaDiss="http://www.d-nb.de/standards/xmetadissplus/"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.d-nb.de/standards/xmetadissplus/ http://files.dnb.de/standards/xmetadissplus/xmetadissplus.xsd">
+            xsi:schemaLocation="http://www.d-nb.de/standards/xmetadissplus/ https://d-nb.info/standards/schema/xmetadissplus.xsd">
 
             <!-- dc:title -->
             <xsl:apply-templates select="TitleMain" mode="xmetadissplus" />
@@ -287,7 +287,17 @@
 
     <xsl:template match="PersonAuthor" mode="xmetadissplus">
        <dc:creator xsi:type="pc:MetaPers">
-         <pc:person>          
+         <pc:person>
+           <xsl:if test="normalize-space(@IdentifierGnd)">
+             <xsl:attribute name="ddb:GND-Nr">
+               <xsl:value-of select="@IdentifierGnd"/>
+             </xsl:attribute>
+            </xsl:if>
+           <xsl:if test="normalize-space(@IdentifierOrcid)">
+              <ddb:ORCID>
+                <xsl:value-of select="@IdentifierOrcid"/>
+              </ddb:ORCID>
+           </xsl:if>
            <xsl:choose>
              <xsl:when test="normalize-space(@FirstName) != '' and normalize-space(@LastName) != ''">
                <pc:name type="nameUsedByThePerson">
@@ -370,6 +380,16 @@
     <xsl:template match="PersonAdvisor" mode="xmetadissplus">
        <dc:contributor xsi:type="pc:Contributor" type="dcterms:ISO3166" thesis:role="advisor">
           <pc:person>
+            <xsl:if test="normalize-space(@IdentifierGnd)">
+                <xsl:attribute name="ddb:GND-Nr">
+                    <xsl:value-of select="@IdentifierGnd"/>
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:if test="normalize-space(@IdentifierOrcid)">
+                <ddb:ORCID>
+                    <xsl:value-of select="@IdentifierOrcid"/>
+                </ddb:ORCID>
+            </xsl:if>
             <xsl:choose>
               <xsl:when test="normalize-space(@FirstName) != '' and normalize-space(@LastName) != ''">
                 <pc:name type="nameUsedByThePerson">
@@ -401,6 +421,16 @@
     <xsl:template match="PersonReferee" mode="xmetadissplus">
        <dc:contributor xsi:type="pc:Contributor" type="dcterms:ISO3166" thesis:role="referee">
            <pc:person>
+            <xsl:if test="normalize-space(@IdentifierGnd)">
+                <xsl:attribute name="ddb:GND-Nr">
+                    <xsl:value-of select="@IdentifierGnd"/>
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:if test="normalize-space(@IdentifierOrcid)">
+                <ddb:ORCID>
+                    <xsl:value-of select="@IdentifierOrcid"/>
+                </ddb:ORCID>
+            </xsl:if>
              <xsl:choose>
                <xsl:when test="normalize-space(@FirstName) != '' and normalize-space(@LastName) != ''">
                  <pc:name type="nameUsedByThePerson">
@@ -432,6 +462,16 @@
     <xsl:template match="PersonEditor" mode="xmetadissplus">
        <dc:contributor xsi:type="pc:Contributor" type="dcterms:ISO3166" thesis:role="editor">
            <pc:person>
+            <xsl:if test="normalize-space(@IdentifierGnd)">
+                <xsl:attribute name="ddb:GND-Nr">
+                    <xsl:value-of select="@IdentifierGnd"/>
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:if test="normalize-space(@IdentifierOrcid)">
+                <ddb:ORCID>
+                    <xsl:value-of select="@IdentifierOrcid"/>
+                </ddb:ORCID>
+            </xsl:if>
              <xsl:choose>
                <xsl:when test="normalize-space(@FirstName) != '' and normalize-space(@LastName) != ''">
                  <pc:name type="nameUsedByThePerson">

diff --git a/modules/solrsearch/models/Search/Abstract.php b/modules/solrsearch/models/Search/Abstract.php
@@ -31,6 +31,8 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Search\Util\Query;
+
 /**
  * Abstract base class for search type implementations.
  *
@@ -121,18 +123,36 @@ public function createQueryBuilderInputFromRequest($request)
             $startParam = $request->getParam('start', 0);
             $rowsParam = $request->getParam('rows', $maxNumber);
             $start = intval($startParam);
-            $rows = intval($rowsParam);
 
-            $input['start'] = $start > 0 ? $start : 0;
+            if (is_string($rowsParam)) {
+                // for invalid values $maxNumber should be used
+                if (ctype_digit($rowsParam)) {
+                    $rows = intval($rowsParam);
+                } else {
+                    $rows = $maxNumber;
+                }
+            } else {
+                $rows = $rowsParam;
+            }
 
-            $input['rows'] = $rows > 0 || ($rows == 0 && $rowsParam == '0') ? $rows : $maxNumber;
+            // rows = 0 should be support to allow just getting the number of possible results (TODO Is it used?)
+            $rows = $rows > $maxNumber || $rows < 0 ? $maxNumber : $rows;
 
-            if ($input['start'] > $maxNumber) {
-                $input['start'] = $maxNumber;
+            // IMPORTANT: 'start' + 'row' must not exceed 2147483647 (java,lang.Integer.MAX_VALUE)
+            if ($start > Query::MAX_ROWS) {
+                $start = Query::MAX_ROWS;
+                $rows  = 0;
+                // TODO throwing exception would be better because this query does not make sense
+                //      need to change tests for changed behaviour
             }
-            if ($input['rows'] + $input['start'] > $maxNumber) {
-                $input['rows'] = $maxNumber - $input['start'];
+            $start = $start > 0 ? $start : 0;
+
+            if ($start + $rows > Query::MAX_ROWS) {
+                $rows = Query::MAX_ROWS - $start;
             }
+
+            $input['rows']  = $rows;
+            $input['start'] = $start;
         }
 
         foreach ($this->_searchFields as $searchField) {

diff --git a/tests/modules/export/controllers/IndexControllerTest.php b/tests/modules/export/controllers/IndexControllerTest.php
@@ -46,6 +46,7 @@
  */
 class Export_IndexControllerTest extends ControllerTestCase
 {
+    protected $configModifiable = true;
 
     protected $additionalResources = 'all';
 
@@ -442,6 +443,24 @@ public function testPaginationIsSupportedInExportWithExtremeValues5()
         $this->helperForOPUSVIER2488('/export/index/index/searchtype/simple/query/opusvier-2488/export/xml/start/2147483646/rows/1', 5, 0);
     }
 
+    public function testPaginationStartValueLargerThanMaxRows()
+    {
+        $this->enableSecurity();
+        $this->addAccessOnModuleExportForGuest();
+
+        /** setting max rows to 5, so it is less than start = 10 */
+        $this->adjustConfiguration(['plugins' => ['export' => ['default' => ['maxDocumentsGuest' => 5]]]]);
+
+        $this->dispatch('/export/index/csv/searchtype/all/export/xml/start/10/rows/10');
+
+        $this->assertResponseCode(200);
+
+        $body = $this->getResponse()->getBody();
+
+        // first line is CSV header, therefore it should be 6 lines
+        $this->assertEquals(6, substr_count($body, PHP_EOL));
+    }
+
     /**
      * end: tests for OPUSVIER-2488
      */
@@ -998,6 +1017,7 @@ public function testNonAdminAccessOnUnrestrictedMarc21ExportAllowed()
      */
     private function addAccessOnModuleExportForGuest()
     {
+        $this->_removeExportFromGuest = true;
         return $this->addModuleAccess('export', 'guest');
     }
 
@@ -1007,6 +1027,7 @@ private function addAccessOnModuleExportForGuest()
      */
     private function removeAccessOnModuleExportForGuest()
     {
+        $this->_removeExportFromGuest = false;
         return $this->removeModuleAccess('export', 'guest');
     }
 

diff --git a/tests/modules/oai/format/XMetaDissPlusTest.php b/tests/modules/oai/format/XMetaDissPlusTest.php
@@ -31,6 +31,9 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
+use Opus\Person;
+use Opus\Model\ModelException;
+
 /**
  * @covers Oai_IndexController
  */
@@ -76,4 +79,75 @@ public function testXmlXsiSchemaDeclarationPresentForXMetaDissPlusMetadata()
             $this->fail('element \'xMetaDiss:xMetaDiss\' not found');
         }
     }
+
+    public function personDataProvider()
+    {
+        return [
+            ['author', 'dc:creator'],
+            ['advisor', 'dc:contributor'],
+            ['referee', 'dc:contributor'],
+            ['editor', 'dc:contributor'],
+        ];
+    }
+
+    /**
+     * @param string $role
+     * @param string $elementName
+     * @throws \Opus\Model\ModelException
+     * @dataProvider personDataProvider
+     */
+    public function testPersonOrcidPresentInXmetaDissPlus($role, $elementName)
+    {
+        $doc = $this->createTestDocument();
+        $doc->setServerState('published');
+
+        $person = new Person();
+        $person->setLastName('author1');
+        $person->setIdentifierOrcid('1111-2222-3333-4444');
+        $documentPerson = $doc->addPerson($person);
+        $documentPerson->setRole($role);
+        $docId = $doc->store();
+
+        $this->dispatch('/oai?verb=GetRecord&metadataPrefix=xMetaDissPlus&identifier=oai::' . $docId);
+
+        $this->assertResponseCode(200);
+
+        $this->registerXpathNamespaces($this->xpathNamespaces);
+
+        $this->assertXpath('//xMetaDiss:xMetaDiss');
+        $this->assertXpath("//xMetaDiss:xMetaDiss/$elementName/pc:person/ddb:ORCID");
+        $this->assertXpathContentContains(
+            "//xMetaDiss:xMetaDiss/$elementName/pc:person/ddb:ORCID",
+            '1111-2222-3333-4444'
+        );
+    }
+
+    /**
+     * @param string $role
+     * @param string $elementName
+     * @throws \Opus\Model\ModelException
+     * @dataProvider personDataProvider
+     */
+    public function testAuthorGndPresentInXmetaDissPlus($role, $elementName)
+    {
+        $doc = $this->createTestDocument();
+        $doc->setServerState('published');
+
+        $person = new Person();
+        $person->setLastName('author1');
+        $person->setIdentifierGnd('GndAuthor1');
+        $documentPerson = $doc->addPerson($person);
+        $documentPerson->setRole($role);
+
+        $docId = $doc->store();
+
+        $this->dispatch('/oai?verb=GetRecord&metadataPrefix=xMetaDissPlus&identifier=oai::' . $docId);
+
+        $this->assertResponseCode(200);
+
+        $this->registerXpathNamespaces($this->xpathNamespaces);
+
+        $this->assertXpath('//xMetaDiss:xMetaDiss');
+        $this->assertXpath("//xMetaDiss:xMetaDiss/$elementName/pc:person[@ddb:GND-Nr=\"GndAuthor1\"]");
+    }
 }