BUG: fixed bug #187 Midas3 to Midas2 import does not work

fixed bug #205 Adding metadata for an item displays warnings

Author: Charles Ma

core/controllers/components/MIDAS2MigrationComponent.php

@@ -440,7 +440,7 @@ private function _createFolderForCommunity($communityidMIDAS2, $parentFolderid)
             }  
           $userDao = $User->getByEmail($email);
 
-          $Folderpolicyuser->createPolicy($user, $folderDao, $policyValue);  
+          $Folderpolicyuser->createPolicy($userDao, $folderDao, $policyValue);  
           }
         } 
       catch(Zend_Exception $e) 

core/database/mysql/3.1.0.sql

@@ -352,6 +352,35 @@ CREATE TABLE IF NOT EXISTS `metadata` (
   KEY `metadatatype_id` (`metadatatype`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=15 ;
 
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','contributor','author','Author of the data');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','date','uploaded','Date when the data was uploaded');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','date','issued','Date when the data was released');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','date','created','Date when the data was created');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','identifier','citation','Citation of the data');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','identifier','uri','URI identifier');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','identifier','pubmed','PubMed identifier');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','identifier','doi','Digital Object Identifier');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','description','general','General description field');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','description','provenance','Provenance of the data');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','description','sponsorship','Sponsor of the data');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','description','publisher','Publisher of the data');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','subject','keyword','Keyword');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','subject','ocis','OCIS subject');
+
 -- --------------------------------------------------------
 
 --

core/database/pgsql/3.1.0.sql

@@ -372,6 +372,35 @@ CREATE TABLE metadatavalue (
     metadatavalue_id integer NOT NULL
 );
 
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','contributor','author','Author of the data');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','date','uploaded','Date when the data was uploaded');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','date','issued','Date when the data was released');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','date','created','Date when the data was created');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','identifier','citation','Citation of the data');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','identifier','uri','URI identifier');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','identifier','pubmed','PubMed identifier');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','identifier','doi','Digital Object Identifier');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','description','general','General description field');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','description','provenance','Provenance of the data');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','description','sponsorship','Sponsor of the data');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','description','publisher','Publisher of the data');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','subject','keyword','Keyword');
+INSERT INTO metadata (metadatatype,element,qualifier,description)
+VALUES ('0','subject','ocis','OCIS subject');
+
 
 --
 -- TOC entry 1622 (class 1259 OID 43224)

core/models/pdo/MetadataModel.php

@@ -35,7 +35,7 @@ function getAllMetadata()
     {
     $rowset = $this->database->fetchAll($this->database->select());
 
-    $metadata = array();
+    $metadata = array('raw' => array(), 'sorted' => array());
     foreach($rowset as $row)
       {
       $dao = $this->initDao('Metadata', $row);