diff --git a/classes/OccurrenceDataset.php b/classes/OccurrenceDataset.php
index 89792ea9d2..a5d3354ae0 100644
--- a/classes/OccurrenceDataset.php
+++ b/classes/OccurrenceDataset.php
@@ -1,8 +1,7 @@
conn = MySQLiConnectionFactory::getCon($type);
+ parent::__construct(null, $type);
}
public function __destruct(){
- if(!($this->conn === null)) $this->conn->close();
+ parent::__destruct();
}
- public function getPublicDatasets(){
- // Tests if field `category` exists in table
- $sqlFields = 'SHOW COLUMNS FROM omoccurdatasets LIKE "category"';
- $fields = $this->conn->query($sqlFields);
- $catExists = $fields->num_rows?TRUE:FALSE;
- $fields->free();
- $retArr = array();
- $sql = '';
- if ($catExists) {
- $sql = 'SELECT datasetid, category, name, notes, description, uid, sortsequence, initialtimestamp, ispublic FROM omoccurdatasets WHERE ispublic=1 ORDER BY category,name';
-
- } else {
- $sql = 'SELECT datasetid, name, notes, description, uid, sortsequence, initialtimestamp, ispublic FROM omoccurdatasets WHERE ispublic=1 ORDER BY name';
- }
- $rs = $this->conn->query($sql);
- while($r = $rs->fetch_assoc()){
- $retArr[] = $r;
- }
- $rs->free();
- return $retArr;
- }
+ public function getPublicDatasets(){
+ $retArr = array();
+ $sql = 'SELECT datasetID, category, name, notes, description, uid, sortSequence, initialTimestamp, ispublic FROM omoccurdatasets WHERE ispublic=1 ORDER BY category, name';
+ if($rs = $this->conn->query($sql)){
+ while($r = $rs->fetch_object()){
+ $category = 0;
+ if($r->category) $category = $this->cleanOutStr($r->category);
+ $retArr[$category][$r->datasetID] = $this->cleanOutArray($r);
+ }
+ $rs->free();
+ }
+ return $retArr;
+ }
public function getPublicDatasetMetadata($dsid){
$retArr = array();
@@ -71,7 +62,7 @@ public function getDatasetMetadata($dsid){
$retArr['uid'] = $r->uid;
$retArr['sort'] = $r->sortsequence;
$retArr['ts'] = $r->initialtimestamp;
- $retArr['ispublic'] = $r->ispublic;
+ $retArr['ispublic'] = $r->ispublic;
}
$rs->free();
//Get roles for current user
diff --git a/collections/datasets/index.php b/collections/datasets/index.php
index 1d315d6d2c..85bd02f522 100644
--- a/collections/datasets/index.php
+++ b/collections/datasets/index.php
@@ -54,7 +54,7 @@
menubar: '',
toolbar: ['undo redo | bold italic underline | link | alignleft aligncenter alignright | formatselect | bullist numlist | indent outdent | blockquote | image'],
branding: false,
- default_link_target: "_blank",
+ default_link_target: "_blank",
paste_as_text: true
});
@@ -119,7 +119,7 @@ function validateAddForm(f){
?>
-
+
@@ -131,20 +131,20 @@ function validateAddForm(f){
-
+
-
+
diff --git a/collections/datasets/publiclist.php b/collections/datasets/publiclist.php
index 62ae4c146f..659ec9b1ad 100644
--- a/collections/datasets/publiclist.php
+++ b/collections/datasets/publiclist.php
@@ -5,55 +5,38 @@
header('Content-Type: text/html; charset='.$CHARSET);
$datasetManager = new OccurrenceDataset();
-$dArr = $datasetManager->getPublicDatasets();
?>
- Public Datasets List
+ = $LANG['PUB_DAT_LIST'] ?>
-
+
= $LANG['PUB_DAT_LIST'] ?>
diff --git a/content/lang/collections/datasets/publiclist.en.php b/content/lang/collections/datasets/publiclist.en.php
index f87b923a16..351ed5a706 100644
--- a/content/lang/collections/datasets/publiclist.en.php
+++ b/content/lang/collections/datasets/publiclist.en.php
@@ -5,6 +5,7 @@
------------------
*/
-$LANG['PUB_DAT_LIST'] = 'Public Datasets List';
-
+$LANG['HOME'] = 'Home';
+$LANG['PUB_DAT_LIST'] = 'Public Datasets List';
+$LANG['NO_DATASETS'] = 'There are no public datasets';
?>
diff --git a/content/lang/collections/datasets/publiclist.es.php b/content/lang/collections/datasets/publiclist.es.php
index 8f07613cd5..67b2be68ad 100644
--- a/content/lang/collections/datasets/publiclist.es.php
+++ b/content/lang/collections/datasets/publiclist.es.php
@@ -5,6 +5,7 @@
------------------
*/
+$LANG['HOME'] = 'Inicio';
$LANG['PUB_DAT_LIST'] = 'Lista de conjuntos de datos públicos';
-
+$LANG['NO_DATASETS'] = 'No hay conjuntos de datos';
?>
diff --git a/content/lang/collections/datasets/publiclist.fr.php b/content/lang/collections/datasets/publiclist.fr.php
index 18823154cd..6a533f916b 100644
--- a/content/lang/collections/datasets/publiclist.fr.php
+++ b/content/lang/collections/datasets/publiclist.fr.php
@@ -5,6 +5,7 @@
------------------
*/
+$LANG['HOME'] = 'Accueil';
$LANG['PUB_DAT_LIST'] = 'Liste des ensembles de données publics';
-
+$LANG['NO_DATASETS'] = "Il n'y a pas d'ensembles de données publics";
?>