Merge branch 'hotline#151102_ensa_integration_bloquee_sur_fichier_marcxml' into 'master'

hotline#151102 : cosmogramme : adding marcxml support for serial

See merge request !4366

VERSIONS_HOTLINE/151102

+ - correctif #151102 : Cosmogramme : Prise en charge du format marcxml pour les périodiques
\ No newline at end of file

library/Class/WebService/OAI/MarcXMLParser.php

@@ -82,23 +82,13 @@ class Class_WebService_OAI_MarcXMLParser extends Class_WebService_OAI_ParserAbst
   }
 
 
-  public function startRecord($attributes) {
-    /**
-     * MarcXML record tag is in OAI/metadata record tag
-     * So it creates the record only on OAI record tag
-     * to avoid two records creation and mark record as deleted if needed
-     */
-    if ($this->parser->inParents('metadata'))
-      return parent::startRecord($attributes);
-  }
-
-
   public function endRecord($data) {
-    if (!$this->parser->inParents('metadata'))
+    if (!$this->_record)
       return;
 
     $splitted_records = $this->_splitRecordWithMaxItemsCount($this->_record, 100);
     $this->_records = array_merge($this->_records, $splitted_records);
+    $this->_record = null;
   }
 
 

tests/library/Class/Cosmogramme/Integration/PhaseNoticeOAITest.php

@@ -251,3 +251,52 @@ class PhaseNoticeOAIKohaMoreThanThousandItemsTest extends PhaseNoticeOAITestCase
                                   Class_Notice::findAll()));
   }
 }
+
+
+
+
+class PhaseNoticeMarcXMLKohaMoreThan100ItemsTest extends PhaseNoticeOAITestCase {
+  protected function _prepareFixtures() {
+    parent::_prepareFixtures();
+
+    Class_Cosmogramme_Integration::find(999)
+      ->setFichier('./notice_revue.marcxml')
+      ->assertSave();
+
+    Class_IntProfilDonnees::find(102)
+      ->setFormat(Class_IntProfilDonnees::FORMAT_UNIMARC_XML)
+      ->setAccents(Class_IntProfilDonnees::ENCODING_UTF8)
+      ->assertSave();
+
+    Class_Notice::deleteBy([]);
+  }
+
+
+  /** @test */
+  public function recordTitlesShouldBeMatieres() {
+    $this->assertEquals(['Matières'],
+                        array_map(function($record)
+                                  {
+                                    return $record->getTitrePrincipal();
+                                  },
+                                  Class_Notice::findAll()));
+  }
+
+
+  /** @test */
+  public function noticeField924CountShouldBe16() {
+    $this->assertEquals(16, sizeof(Class_Notice::find(1)->get_subfield('924')));
+  }
+
+
+  /** @test */
+  public function noticeField955CountShouldBe16() {
+    $this->assertEquals(16, sizeof(Class_Notice::find(1)->get_subfield('955')));
+  }
+
+
+  /** @test */
+  public function recordExemplaireCountShouldBe93() {
+    $this->assertEquals(93,Class_Exemplaire::count());
+  }
+}