Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit 8aea0c5

Browse files
author
Julien Jomier
committed
ENH: Added common metadata
1 parent 77ad370 commit 8aea0c5

File tree

5 files changed

+62
-25
lines changed

5 files changed

+62
-25
lines changed

‎core/controllers/components/MIDAS2MigrationComponent.php‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -184,18 +184,6 @@ private function _createFolderForItem($collectionId, $parentFolderid)
184184

185185
// Add the metadata
186186
$MetadataModel = $modelLoader->loadModel("Metadata");
187-
// Register the common metadata (this should move to the main function)
188-
try
189-
{
190-
$MetadataModel->addMetadata(MIDAS_METADATA_GLOBAL,'contributor','author','Author of the data');
191-
$MetadataModel->addMetadata(MIDAS_METADATA_GLOBAL,'date','uploaded','Date when the data was uploaded to MIDAS');
192-
$MetadataModel->addMetadata(MIDAS_METADATA_GLOBAL,'date','issued','Date when the data was published');
193-
$MetadataModel->addMetadata(MIDAS_METADATA_GLOBAL,'date','created','Date when the data was created');
194-
}
195-
catch(Zend_Exception $e)
196-
{
197-
//we continue
198-
}
199187

200188
//
201189
$metadataquery = pg_query("SELECT metadata_field_id,text_value FROM metadatavalue WHERE item_id=".$item_id);
@@ -213,8 +201,18 @@ private function _createFolderForItem($collectionId, $parentFolderid)
213201
{
214202
case 3: $element='contributor'; $qualifier='author'; break;
215203
case 11: $element='date'; $qualifier='uploaded'; break;
216-
case 15: $element='date'; $qualifier='issued'; break;
217204
case 14: $element='date'; $qualifier='created'; break;
205+
case 15: $element='date'; $qualifier='issued'; break;
206+
case 18: $element='identifier'; $qualifier='citation'; break;
207+
case 25: $element='identifier'; $qualifier='uri'; break;
208+
case 26: $element='description'; $qualifier='general'; break;
209+
case 28: $element='description'; $qualifier='provenance'; break;
210+
case 29: $element='description'; $qualifier='sponsorship'; break;
211+
case 39: $element='description'; $qualifier='publisher'; break;
212+
case 57: $element='subject'; $qualifier='keyword'; break;
213+
case 68: $element='subject'; $qualifier='ocis'; break;
214+
case 75: $element='identifier'; $qualifier='pubmed'; break;
215+
case 74: $element='identifier'; $qualifier='doi'; break;
218216
}
219217

220218
if($element != "")

‎core/database/upgrade/3.0.14.php‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?php
2+
3+
class Upgrade_3_0_14 extends MIDASUpgrade
4+
{
5+
public function preUpgrade()
6+
{
7+
// Insert common metadata
8+
$this->db->query("INSERT INTO metadata (metadatatype,element,qualifier,description) VALUES ('0','contributor','author','Author of the data')");
9+
$this->db->query("INSERT INTO metadata (metadatatype,element,qualifier,description) VALUES ('0','date','uploaded','Date when the data was uploaded')");
10+
$this->db->query("INSERT INTO metadata (metadatatype,element,qualifier,description) VALUES ('0','date','issued','Date when the data was released')");
11+
$this->db->query("INSERT INTO metadata (metadatatype,element,qualifier,description) VALUES ('0','date','created','Date when the data was created')");
12+
$this->db->query("INSERT INTO metadata (metadatatype,element,qualifier,description) VALUES ('0','identifier','citation','Citation of the data')");
13+
$this->db->query("INSERT INTO metadata (metadatatype,element,qualifier,description) VALUES ('0','identifier','uri','URI identifier')");
14+
$this->db->query("INSERT INTO metadata (metadatatype,element,qualifier,description) VALUES ('0','identifier','pubmed','PubMed identifier')");
15+
$this->db->query("INSERT INTO metadata (metadatatype,element,qualifier,description) VALUES ('0','identifier','doi','Digital Object Identifier')");
16+
$this->db->query("INSERT INTO metadata (metadatatype,element,qualifier,description) VALUES ('0','description','general','General description field')");
17+
$this->db->query("INSERT INTO metadata (metadatatype,element,qualifier,description) VALUES ('0','description','provenance','Provenance of the data')");
18+
$this->db->query("INSERT INTO metadata (metadatatype,element,qualifier,description) VALUES ('0','description','sponsorship','Sponsor of the data')");
19+
$this->db->query("INSERT INTO metadata (metadatatype,element,qualifier,description) VALUES ('0','description','publisher','Publisher of the data')");
20+
$this->db->query("INSERT INTO metadata (metadatatype,element,qualifier,description) VALUES ('0','subject','keyword','Keyword')");
21+
$this->db->query("INSERT INTO metadata (metadatatype,element,qualifier,description) VALUES ('0','subject','ocis','OCIS subject')");
22+
}
23+
24+
public function mysql()
25+
{
26+
}
27+
28+
29+
public function pgsql()
30+
{
31+
}
32+
33+
public function postUpgrade()
34+
{
35+
}
36+
}
37+
?>
38+
39+

‎core/public/css/admin/admin.showlog.css‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,8 @@ tr.logSum{
44

55
.ui-widget-content{
66
border: none!important;
7-
}
7+
}
8+
9+
.ui-datepicker{
10+
clear: both;
11+
}

‎core/public/js/admin/admin.showlog.js‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ function initLogs()
4242
});
4343
}
4444

45-
4645
var dates = $( "#startlog, #endlog" ).datepicker({
4746
defaultDate: "-1w",
4847
changeMonth: true,
@@ -56,12 +55,9 @@ var dates = $( "#startlog, #endlog" ).datepicker({
5655
selectedDate, instance.settings );
5756
dates.not( this ).datepicker( "option", option, date );
5857
}
59-
});
60-
61-
62-
$('#logSelector').ajaxForm( {beforeSubmit: validateShowlog, success: successShowlog} );
63-
58+
});
6459

60+
$('#logSelector').ajaxForm( {beforeSubmit: validateShowlog, success: successShowlog} );
6561

6662
function validateShowlog(formData, jqForm, options) {
6763
$('table#listLogs').hide();
@@ -80,4 +76,4 @@ function successShowlog(responseText, statusText, xhr, form)
8076
return false;
8177
}
8278
initLogs();
83-
}
79+
}

‎core/views/admin/showlog.phtml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
</select>
1818
<label for="prioritylog">Priority</label>
1919
<select id="prioritylog" name="prioritylog">
20-
<option value="all">all</option>";
21-
<option value="2">critical</option>";
22-
<option value="4">warning</option>";
23-
<option value="6">info</option>";
20+
<option value="all">all</option>
21+
<option value="2">critical</option>
22+
<option value="4">warning</option>
23+
<option value="6">info</option>
2424
</select>
2525
<br/>
2626
<input type='submit' value='Filter' />

0 commit comments

Comments
 (0)