+
\ No newline at end of file
diff --git a/application/admin/views/scripts/data/sourceselect.phtml b/application/admin/views/scripts/data/sourceselect.phtml
new file mode 100644
index 00000000..eab90f68
--- /dev/null
+++ b/application/admin/views/scripts/data/sourceselect.phtml
@@ -0,0 +1,91 @@
+headTitle($this->config->title->site);
+ $this->headTitle('后台管理');
+ $this->headTitle()->setSeparator(' - ');
+ $this->headLink()->appendStylesheet('/css/admin.css');
+ $this->headScript()->appendFile('/js/jquery-1.6.4.min.js');
+ $this->breadcrumb('首页');
+ $this->breadcrumb('后台首页');
+ $this->breadcrumb('数据管理');
+ $this->breadcrumb('项目来源管理');
+ $this->breadcrumb()->setSeparator(' > ');
+?>
+
+partial('data/left.phtml'); ?>
+
+
+
+msg or $this->messages) :?>
+
+msg) : ?>
+
msg; ?>
+messages): foreach($this->messages as $msg): ?>
+
+
+
+
+
+为元数据《info['title'];?>》选择项目来源
+
+
+
+
+
+
+
+info['id']))
+ {
+ ?>
+
+
+
+
paginator; ?>
+
+
\ No newline at end of file
diff --git a/application/admin/views/scripts/data/sync.phtml b/application/admin/views/scripts/data/sync.phtml
index aac98b46..dd3d5833 100644
--- a/application/admin/views/scripts/data/sync.phtml
+++ b/application/admin/views/scripts/data/sync.phtml
@@ -29,6 +29,7 @@
diff --git a/application/config.ini b/application/config.ini
index 3fffd23e..b03c0b1b 100755
--- a/application/config.ini
+++ b/application/config.ini
@@ -14,10 +14,10 @@ geonetwork.params.dbname = wdscar_geonetwork
watergeonetwork.url=http://210.77.68.237:8080/geonetwork/
waterdb.adapter = PDO_PGSQL
-waterdb.params.host = 210.77.68.252
-waterdb.params.username = wlz
-waterdb.params.password = glacier
-waterdb.params.dbname = new_geonetwork
+waterdb.params.host = 210.77.68.237
+waterdb.params.username = postgres
+waterdb.params.password = "test@))("
+waterdb.params.dbname = geonetwork252
heihedb.adapter = PDO_PGSQL
heihedb.params.host = 210.77.68.252
heihedb.params.username = wlz
@@ -27,6 +27,7 @@ heihedb.params.dbname = heihe
seekspace.url=http://seekspace.resip.ac.cn/
seekspace.handleurl=http://seekspace.resip.ac.cn/handle
google.maps.api=ABQIAAAACD-MqkkoOm60o_dvwdcKVhQZ6FKmpkjmtV0YgdpDmHkvWF4pMRRbrl4iUSDP3HkLNg5iOMge8vdOvg
+bigthumb.path=../geonetwork/data/
paths.base = /var/www/test.westgis.ac.cn
paths.data = /var/www/test.westgis.ac.cn/data
diff --git a/application/default/controllers/DataController.php b/application/default/controllers/DataController.php
index 245850ae..3bb6a7f8 100755
--- a/application/default/controllers/DataController.php
+++ b/application/default/controllers/DataController.php
@@ -12,30 +12,28 @@ class DataController extends Zend_Controller_Action
}
function indexAction()
{
- $md = new MetadataTable();
- $db=$md->getAdapter();
//序列
- $state=$db->query('select s.id,name,count(*) from series s,dataseries d where d.sid=s.id group by s.id,s.name');
+ $state=$this->db->query('select s.id,name,count(*) from series s,dataseries d where d.sid=s.id group by s.id,s.name');
$this->view->serie=$state->fetchAll();
//分类
- $state=$db->query('select c.code,name,name_zh,count(*) from category c,categorycode cc where c.code=cc.code group by c.code,cc.name,cc.name_zh');
+ $state=$this->db->query('select c.code,name,name_zh,count(*) from category c,categorycode cc where c.code=cc.code group by c.code,cc.name,cc.name_zh');
$this->view->category=$state->fetchAll();
//关键词
- $state=$db->query("select keyword,count(*) from keyword where keytype='place' group by keyword order by count desc limit 20");
+ $state=$this->db->query("select keyword,count(*) from keyword where keytype='place' group by keyword order by count desc limit 20");
$k1=$state->fetchAll();
//$state=$db->query("select keyword,count(*) from keyword where keytype='theme' group by keyword order by count desc limit 20");
- $state=$db->query("select k.keyword,count(k.keyword) from keyword k left join metadata m on k.id=m.id where k.keytype='theme' and (m.uuid in (select uuid from dataorder group by uuid order by count(uuid) desc limit 20)) group by k.keyword order by count(k.keyword) desc limit 20");
+ $state=$this->db->query("select k.keyword,count(k.keyword) from keyword k left join normalmetadata m on k.id=m.id where k.keytype='theme' and (m.uuid in (select uuid from dataorder group by uuid order by count(uuid) desc limit 20)) group by k.keyword order by count(k.keyword) desc limit 20");
$k2=$state->fetchAll();
- $state=$db->query("select keyword,count(*) from keyword where keytype='discipline' group by keyword order by count desc limit 20");
+ $state=$this->db->query("select keyword,count(*) from keyword where keytype='discipline' group by keyword order by count desc limit 20");
$k3=$state->fetchAll();
- $state=$db->query("select keyword,count(*) from keyword where keytype='stratum' group by keyword order by count desc limit 20");
+ $state=$this->db->query("select keyword,count(*) from keyword where keytype='stratum' group by keyword order by count desc limit 20");
$k4=$state->fetchAll();
//$state=$db->query("select keyword,count(*) from keyword where keytype='temporal' group by keyword order by count desc limit 20");
- $state=$db->query("select k.keyword,count(k.keyword) from keyword k left join metadata m on k.id=m.id where k.keytype='temporal' and (m.uuid in (select uuid from dataorder group by uuid order by count(uuid) desc limit 20)) group by k.keyword order by count(k.keyword) desc limit 20");
+ $state=$this->db->query("select k.keyword,count(k.keyword) from keyword k left join normalmetadata m on k.id=m.id where k.keytype='temporal' and (m.uuid in (select uuid from dataorder group by uuid order by count(uuid) desc limit 20)) group by k.keyword order by count(k.keyword) desc limit 20");
$k5=$state->fetchAll();
$this->view->keywords=array('place'=>$k1,'theme'=>$k2,'discipline'=>$k3,'stratum'=>$k4,'temporal'=>$k5);
//最新10个入库数据
- $state=$db->query('select id,uuid,title from metadata order by id desc limit 10');
+ $state=$this->db->query('select id,uuid,title from normalmetadata order by id desc limit 10');
$this->view->metadata = $state->fetchAll();
//特色数据
@@ -78,34 +76,30 @@ class DataController extends Zend_Controller_Action
}
function onlinelistAction()
{
- $md=new MetadataTable();
- $db=$md->getAdapter();
$page=(int)$this->_request->getParam('page');
if (empty($page)) $page=1;
$limit=30;
$offset=$limit*($page-1);
- $state=$db->query('select count(*) from metadata where datatype=0');
+ $state=$this->db->query('select count(*) from normalmetadata where datatype=0');
$row=$state->fetchAll();
$sum=$row[0]['count'];
- $select=$db->select();
- $select->from('metadata','*')->where('datatype=0')->order('title')->limitPage($page,$limit);
- $this->view->metadata = $db->fetchAll($select);
+ $select=$this->db->select();
+ $select->from('normalmetadata','*')->where('datatype=0')->order('title')->limitPage($page,$limit);
+ $this->view->metadata = $this->db->fetchAll($select);
$this->view->page=new Pagination($sum,$page,$limit);
}
function offlinelistAction()
{
- $md=new MetadataTable();
- $db=$md->getAdapter();
$page=(int)$this->_request->getParam('page');
if (empty($page)) $page=1;
$limit=30;
$offset=$limit*($page-1);
- $state=$db->query('select count(*) from metadata where datatype=1');
+ $state=$this->db->query('select count(*) from normalmetadata where datatype=1');
$row=$state->fetchAll();
$sum=$row[0]['count'];
- $select=$db->select();
- $select->from('metadata','*')->where('datatype=1')->order('title')->limitPage($page,$limit);
- $this->view->metadata = $db->fetchAll($select);
+ $select=$this->db->select();
+ $select->from('normalmetadata','*')->where('datatype=1')->order('title')->limitPage($page,$limit);
+ $this->view->metadata = $this->db->fetchAll($select);
$this->view->page=new Pagination($sum,$page,$limit);
}
//展示最近20条离线神情记录情况
@@ -179,48 +173,44 @@ class DataController extends Zend_Controller_Action
*/
function browseAction()
{
- $md=new MetadataTable();
- $db=$md->getAdapter();
$page=(int)$this->_request->getParam('page');
if (empty($page)) $page=1;
$limit=10;
$offset=$limit*($page-1);
- $state=$db->query('select count(*) from metadata');
+ $state=$this->db->query('select count(*) from metadata');
$row=$state->fetchAll();
$sum=$row[0]['count'];
- $select=$db->select();
+ $select=$this->db->select();
$select->from('metadata','*')->order('id desc')->limitPage($page,$limit);
- $this->view->metadata = $db->fetchAll($select);
+ $this->view->metadata = $this->db->fetchAll($select);
$this->view->page=new Pagination($sum,$page,$limit);
}
function tagAction()
{
$id = (int)$this->_request->getParam('id');
$key = $this->_request->getParam('key');
- $md=new KeywordTable();
- $db=$md->getAdapter();
$page=(int)$this->_request->getParam('page');
if (empty($page)) $page=1;
$limit=10;
$offset=$limit*($page-1);
- $state=$db->query('select keyword,count(*),keytype from keyword group by keyword,keytype order by keytype,keyword,count desc');
+ $state=$this->db->query('select keyword,count(*),keytype from keyword group by keyword,keytype order by keytype,keyword,count desc');
$this->view->keywords=$state->fetchAll();
if ($id>0 or !empty($key)) {
if (empty($key)) {
- $where=$db->quoteInto('id = ?',$id);
+ $where=$this->db->quoteInto('id = ?',$id);
$row=$md->fetchRow($where);
$key=$row->name;
}
$this->view->codename=$key;
- $sql=$db->quoteInto('select count(m.id) from metadata m,keyword k where m.id=k.id and k.keyword=?',$key);
- $state=$db->query($sql);
+ $sql=$this->db->quoteInto('select count(m.id) from normalmetadata m,keyword k where m.id=k.id and k.keyword=?',$key);
+ $state=$this->db->query($sql);
$row=$state->fetchAll();
$sum=$row[0]['count'];
- $select=$db->select();
- $select->from('metadata','*')->join('keyword','metadata.id=keyword.id')->where('keyword.keyword=?',$key)->order('metadata.title')->limitPage($page,$limit);
+ $select=$this->db->select();
+ $select->from('normalmetadata','*')->join('keyword','normalmetadata.id=keyword.id')->where('keyword.keyword=?',$key)->order('normalmetadata.title')->limitPage($page,$limit);
//$sql=$db->quoteInto('select m.* from metadata m,keyword k where m.id=k.id and k.keyword=?',$key);
//$state=$db->query($sql);
- $this->view->metadata=$db->fetchAll($select);
+ $this->view->metadata=$this->db->fetchAll($select);
$this->view->page=new Pagination($sum,$page,$limit);
}
}
@@ -237,51 +227,50 @@ class DataController extends Zend_Controller_Action
$id='';
}
$keyword=$this->_request->getParam('keyword');
- $md=new SeriesTable();
- $db=$md->getAdapter();
if (empty($id)) {
if (!empty($name))
{
- $where=$db->quoteInto('name = ?',$name);
- $row=$md->fetchRow($where);
+ $where=$this->db->quoteInto('name = ?',$name);
+ $row=$this->db->fetchRow("select * from series where ".$where);
}
} else {
- $where=$db->quoteInto('id = ?',$id);
- $row=$md->fetchRow($where);
+ $where=$this->db->quoteInto('id = ?',$id);
+ $row=$this->db->fetchRow("select * from series where ".$where);
}
if (!empty($id) or !empty($name))
{
if (!$row) $this->_redirect('/data');
- $id=$row->id;
+ $id=$row['id'];
}
$page=(int)$this->_request->getParam('page');
if (empty($page)) $page=1;
$limit=10;
$offset=$limit*($page-1);
- $state=$db->query('select s.id,name,count(*) from series s,dataseries d where d.sid=s.id group by s.id,s.name');
+ $state=$this->db->query('select s.id,name,count(*) from series s,dataseries d where d.sid=s.id group by s.id,s.name');
$this->view->serie=$state->fetchAll();
if ($id>0) {
- $where=$db->quoteInto('id = ?',$id);
- $row=$md->fetchRow($where);
- $this->view->codename=$row->name;
+ //$where=$this->db->quoteInto('id = ?',$id);
+ //$row=$this->db->fetchRow("select * from series where ".$where);
+ $this->view->codename=$row['name'];
if (!empty($keyword))
{
- $sql='select count(m.id) as count from metadata m,dataseries d,keyword k where m.id=d.id and m.id=k.id and d.sid=? and k.keyword=?';
- $row=$db->fetchAll($sql,array($id,$keyword));
+ $sql='select count(m.id) as count from normalmetadata m,dataseries d,keyword k where m.id=d.id and m.id=k.id and d.sid=? and k.keyword=?';
+ $row=$this->db->fetchAll($sql,array($id,$keyword));
+ $this->view->codename.="【关键词：".$keyword."】";
}else{
- $sql='select count(m.id) as count from metadata m,dataseries d where m.id=d.id and d.sid=?';
- $row=$db->fetchAll($sql,array($id));
+ $sql='select count(m.id) as count from normalmetadata m,dataseries d where m.id=d.id and d.sid=?';
+ $row=$this->db->fetchAll($sql,array($id));
}
$sum=$row[0]['count'];
- $select=$db->select();
- $select->from('metadata','*')->join('dataseries','metadata.id=dataseries.id')->where('dataseries.sid=?',$id)->order('metadata.title')->limitPage($page,$limit);
- if (!empty($keyword)) $select->join('keyword','keyword.id=metadata.id')->where('keyword.keyword=?',$keyword);
- $this->view->metadata=$db->fetchAll($select);
+ $select=$this->db->select();
+ $select->from('normalmetadata','*')->join('dataseries','normalmetadata.id=dataseries.id')->where('dataseries.sid=?',$id)->order('normalmetadata.title')->limitPage($page,$limit);
+ if (!empty($keyword)) $select->join('keyword','keyword.id=normalmetadata.id')->where('keyword.keyword=?',$keyword);
+ $this->view->metadata=$this->db->fetchAll($select);
$this->view->page=new Pagination($sum,$page,$limit);
- $this->view->showtools=($sum>$page)?true:false;
- $this->view->form=new SearchForm();
- $sql=$db->quoteInto("select keyword,count(*) as count from (select t.keyword,t.id from keyword t left join dataseries d on t.id=d.id where t.keytype='place' and d.sid=?) as f group by keyword order by count desc limit 30",$id);
- $state=$db->query($sql);
+ //$this->view->showtools=($sum>$page)?true:false;
+ //$this->view->form=new SearchForm();
+ $sql=$this->db->quoteInto("select keyword,count(*) as count from (select t.keyword,t.id from keyword t left join dataseries d on t.id=d.id where t.keytype='place' and d.sid=?) as f group by keyword order by count desc limit 30",$id);
+ $state=$this->db->query($sql);
$row=$state->fetchAll();
$this->view->places=$row;
$this->view->seriesid=$id;
@@ -296,25 +285,19 @@ class DataController extends Zend_Controller_Action
{
$page = $this->_request->getParam('page');
$code = (int)$this->_request->getParam('code');
- $md=new CategoryCodeTable();
- $db=$md->getAdapter();
- $state=$db->query('select c.code,name,name_zh,count(*) from category c,categorycode cc where c.code=cc.code group by c.code,cc.name,cc.name_zh');
+ $state=$this->db->query('select c.code,name,name_zh,count(*) from category c,categorycode cc where c.code=cc.code group by c.code,cc.name,cc.name_zh');
$this->view->category=$state->fetchAll();
if ($code>0 && $code<20) {
- $where=$db->quoteInto('code = ?',$code);
- $row=$md->fetchRow($where);
- $this->view->codename=(empty($row->name_zh)?$row->name:$row->name_zh);
- $sql='select m.* from metadata m,category c where m.id=c.id and c.code=? order by m.title';
- $state=$db->query($sql,array($code));
- $rows = $state->fetchAll();
-
- $paginator = Zend_Paginator::factory($rows);
- $paginator->setCurrentPageNumber($page);//($this->_getParam('page'));
- $paginator->setItemCountPerPage($this->view->config->page->max);
- $paginator->setView($this->view);
- Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
- $this->view->paginator=$paginator;
-
+ $where=$this->db->quoteInto('code = ?',$code);
+ $row=$this->db->fetchRow("select * from categorycode where ".$where);
+ $this->view->codename=(empty($row['name_zh'])?$row['name']:$row['name_zh']);
+ $sql='select count(m.id) from normalmetadata m left join category c on m.id=c.id where c.code=?';
+ $row=$this->db->fetchRow($sql,array($code));
+ $sum=$row['count'];
+ $select=$this->db->select();
+ $select->from('normalmetadata as m','*')->joinLeft('category as c','m.id=c.id')->where('c.code=?',$code)->order('m.title')->limitPage($page,$this->limit);
+ $this->view->metadata=$this->db->fetchAll($select);
+ $this->view->page=new Pagination($sum,$page,$this->limit);
} else {
//提供全部分类列表
}
@@ -326,14 +309,14 @@ class DataController extends Zend_Controller_Action
function timelineAction()
{
$fn="time1.xml";
- $rows=$this->db->fetchAll("select ts_created from metadata order by ts_created desc limit 1");
+ $rows=$this->db->fetchAll("select ts_created from normalmetadata order by ts_created desc limit 1");
$last_update=strtotime($rows[0]['ts_created']);
if (!file_exists($fn) || (filemtime($fn)<$last_update))
{
$dateformat="M j Y";
$md = new MetadataTable();
$db=$md->getAdapter();
- $state=$db->query('select id,uuid,description,title,timebegin,timeend from metadata where timebegin is not null order by timebegin');
+ $state=$db->query('select id,uuid,description,title,timebegin,timeend from normalmetadata where timebegin is not null order by timebegin');
$rows=$state->fetchAll();
$timexml='';
foreach($rows as $row) {
@@ -372,7 +355,7 @@ class DataController extends Zend_Controller_Action
$id = (int)$this->_request->getParam('id');
$where='';
if (!empty($id)) { $where=' where id='.$id; }
- $sql='select id,uuid,west,south,north,east,title from metadata'.$where;
+ $sql='select id,uuid,west,south,north,east,title from normalmetadata'.$where;
$state=$db->query($sql);
$rows=$state->fetchAll();
$geomd=new GeoMetaData();
@@ -396,7 +379,7 @@ class DataController extends Zend_Controller_Action
*/
function timemapAction()
{
- $sql='select id,uuid,west,south,north,east,title,timebegin,timeend from metadata where timebegin is not null';
+ $sql='select id,uuid,west,south,north,east,title,timebegin,timeend from normalmetadata where timebegin is not null';
$this->view->rows=$this->db->fetchAll($sql);
}
/*
@@ -445,7 +428,7 @@ class DataController extends Zend_Controller_Action
//'generator' => 'Zend Framework Zend_Feed',
'entries' => array()
);
- $sql="select * from metadata order by ts_created desc";
+ $sql="select * from normalmetadata order by ts_created desc";
$rs=$this->db->fetchAll($sql);
$feedArray['published']=strtotime($rs[0]['ts_created']);
foreach($rs as $r)
@@ -483,9 +466,9 @@ class DataController extends Zend_Controller_Action
$offset=$this->limit*($page-1);
$search=new Search($key);
$where=$search->sql_expr(array("title","description"));
- $row=$this->db->fetchAll("select count(*) from metadata where ".$where);
+ $row=$this->db->fetchAll("select count(*) from normalmetadata where ".$where);
$sum=$row[0]['count'];
- $sql="select uuid,title,id,description from metadata where ".$where." order by title limit ? offset ?";
+ $sql="select uuid,title,id,description from normalmetadata where ".$where." order by title limit ? offset ?";
$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
$this->view->page=new Pagination($sum,$page,$this->limit);
$this->view->key=$key;
@@ -519,15 +502,15 @@ class DataController extends Zend_Controller_Action
$start=$this->_request->getParam('start');
$end=$this->_request->getParam('end');
if (!empty($key)) {
- $sql='select count(*) from metadata where east? and north? and (title ilike ? or description ilike ?)';
+ $sql='select count(*) from normalmetadata where east? and north? and (title ilike ? or description ilike ?)';
$row=$db->fetchAll($sql,array($e,$w,$n,$s,'%'.$key.'%','%'.$key.'%'));
} else {
- $sql='select count(*) from metadata where east? and north?';
+ $sql='select count(*) from normalmetadata where east? and north?';
$row=$db->fetchAll($sql,array($e,$w,$n,$s));
}
$sum=$row[0]['count'];
$select=$db->select();
- $select->from('metadata','*')->where('eastwhere('west>?',$w)->where('northwhere('south>?',$s);
+ $select->from('normalmetadata','*')->where('eastwhere('west>?',$w)->where('northwhere('south>?',$s);
if (!empty($key)) $select->where('(title ilike ? or description ilike ?)','%'.$key.'%');
$select->order('title')->limit($limit,$offset);
$this->view->metadata = $db->fetchAll($select);
@@ -541,68 +524,71 @@ class DataController extends Zend_Controller_Action
*/
function viewAction()
{
- $md=new MetadataTable();
- $db=$md->getAdapter();
$id = (int)$this->_request->getParam('id');
+ $sql="select m.*,s.status,g.id as gid,t.filename from normalmetadata m left join mdstatus s on m.uuid=s.uuid
+ left join thumbnail t on t.id=m.id left join geonetworkmetadata g on m.uuid=g.uuid where ";
if (empty($id)) {
$uuid = $this->_request->getParam('uuid');
if (empty($uuid)) $this->_redirect('/data');
- $where=$db->quoteInto('uuid = ?',$uuid);
- $row=$md->fetchRow($where);
+ $where=$this->db->quoteInto('m.uuid = ?',$uuid);
} else {
- $where=$db->quoteInto('id = ?',$id);
- $row=$md->fetchRow($where);
+ $where=$this->db->quoteInto('m.id = ?',$id);
}
+ $sql.=$where;
+ $this->db->setFetchMode(Zend_Db::FETCH_OBJ);
+ $row=$this->db->fetchRow($sql);
if (!$row) $this->_redirect('/data');
$id=$row->id;
$uuid=$row->uuid;
$this->view->metadata=$row;
- //提前对表格进行预处理
+ //提前对表格进行预处理
$wiki=new WikiFormat();
$this->view->metadata->description=$wiki->parseTable($this->view->escape($row->description));
//处理外部链接
- $this->view->metadata->description=preg_replace('/\[\s*(http:\/\/.+?)\s+(.*?)\]/m','$2',$this->view->metadata->description);
+ $this->view->metadata->description=preg_replace('/\[\s*(http:\/\/.+?)\s+(.*?)\]/m','$2',$this->view->metadata->description);
+ $this->view->thumburl='/gndata/'.sprintf('%05d',floor(($row->gid+0.1)/100)*100).'-'.sprintf('%05d',ceil(($row->gid+0.1)/100)*100-1)."/".$row->gid;
+ $this->view->thumburl.='/public/'.str_replace('_s.','.',$row->filename);
if (is_numeric($row->projection))
{
$sql="select proj4text from spatial_ref_sys where auth_srid=?";
- $rs=$db->fetchRow($sql,array((int)$row->projection));
- if ($rs) $this->view->projection=$rs['proj4text'];
+ $rs=$this->db->fetchRow($sql,array((int)$row->projection));
+ if ($rs) $this->view->projection=$rs->proj4text;
}
$this->view->keys=$this->db->fetchAll("select * from keyword where id=? order by keytype,ts_created",array($id));
$sql='select c.code,cc.name,cc.name_zh from category c,categorycode cc where c.code=cc.code and c.id= ?';
- $state=$db->query($sql,array($id));
+ $state=$this->db->query($sql,array($id));
$this->view->category=$state->fetchAll();
$sql='select s.name,s.id from dataseries d, series s where d.sid=s.id and d.id= ?';
- $state=$db->query($sql,array($id));
+ $state=$this->db->query($sql,array($id));
$this->view->series=$state->fetchAll();
- $sql=$db->quoteInto("select count(*) as count from dataorder where uuid=?",$uuid);
- $row=$db->fetchRow($sql);
- $this->view->downloaded=$row['count'];
+ $sql=$this->db->quoteInto("select count(*) as count from dataorder where uuid=?",$uuid);
+ $row=$this->db->fetchRow($sql);
+ $this->view->downloaded=$row->count;
//update the viewed times
$sql="update mdstat set viewed=viewed+1 where uuid=?";
- $db->query($sql,array($uuid));
- $sql=$db->quoteInto("select viewed from mdstat where uuid=?",$uuid);
- $row=$db->fetchRow($sql);
- $this->view->viewed=$row['viewed'];
+ $this->db->query($sql,array($uuid));
+ $sql=$this->db->quoteInto("select viewed from mdstat where uuid=?",$uuid);
+ $row=$this->db->fetchRow($sql);
+ $this->view->viewed=$row->viewed;
//数据文档
$sql="select linkage from onlineresource where uuid=? and description='数据说明文档'";
- $sql=$db->quoteInto($sql,$uuid);
- $row=$db->fetchRow($sql);
- if ($row) $this->view->doc=$row['linkage'];
+ $sql=$this->db->quoteInto($sql,$uuid);
+ $row=$this->db->fetchRow($sql);
+ if ($row) $this->view->doc=$row->linkage;
//相关资源
$sql="select * from onlineresource where uuid=? and description<>'数据说明文档' and (linkage not like '%ftp.westgis%') and name<>'元数据地址'";
- $sql=$db->quoteInto($sql,$uuid);
- $this->view->resources=$db->fetchAll($sql);
+ $sql=$this->db->quoteInto($sql,$uuid);
+ $this->view->resources=$this->db->fetchAll($sql);
//建议参考文献
$sql="select r.* from reference r left join mdref m on m.refid=r.id where m.uuid=?";
- $sql=$db->quoteInto($sql,$uuid);
- $this->view->ref=$db->fetchAll($sql);
+ $sql=$this->db->quoteInto($sql,$uuid);
+ $this->view->ref=$this->db->fetchAll($sql);
//相关用户
$sql="select p.email,p.individual,p.organisation,r.role from role r left join responsible p on r.resid=p.id where r.uuid=? order by r.role,r.id";
- $this->view->authors=$db->fetchAll($sql,array($uuid));
+ $this->view->authors=$this->db->fetchAll($sql,array($uuid));
//数据限制信息
$sql="select u.* from uselimit u left join mdlimit m on u.id=m.lid where m.uuid=?";
- $this->view->uselimits=$db->fetchAll($sql,array($uuid));
+ $this->view->uselimits=$this->db->fetchAll($sql,array($uuid));
//相关元数据，根据同名关键词实现
//$sql="select distinct(md.uuid),md.title from keyword kw left join metadata md on kw.id=md.id where kw.keyword in (select k.keyword from keyword k left join metadata m on k.id=m.id where m.id=? and k.keytype='theme') and kw.id<>? limit 10";
$sql="select distinct(md.uuid),md.title from keyword kw left join metadata md on kw.id=md.id where kw.keyword in (select k.keyword from keyword k left join metadata m on k.id=m.id where m.id=?) and kw.id<>? limit 10";
@@ -611,9 +597,9 @@ class DataController extends Zend_Controller_Action
$sql="select * from knl_article where ";
foreach($this->view->keys as $k)
{
- if ($k["keytype"]=='theme')
+ if ($k->keytype=='theme')
{
- $sql.=" title like '%".$k["keyword"]."%' or ";
+ $sql.=" title like '%".$k->keyword."%' or ";
}
}
$sql.=" 1<>1 limit 10";
@@ -650,6 +636,18 @@ class DataController extends Zend_Controller_Action
$content=$stripper->filter($formdata['content']);
$author=$stripper->filter($formdata['author']);
$this->db->query($sql,array($formdata['uid'],$formdata['uuid'],$author,$formdata['email'],$formdata['url'],$ip,$content,$agent,$type));
+ $patt = array();
+ $patt['user'] = $author;
+ $patt['uuid'] = $formdata['uuid'];
+ $patt['title']= $this->view->metadata->title;
+ $patt['content']= $content;
+ $mailtp=new EmailText($this->db,"data-comment-note",$patt);
+ $mail=new WestdcMailer($this->view->config->smtp);
+ $mail->setBodyText($mailtp->getBody());
+ $mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
+ $mail->addTo($this->view->config->service->email);
+ $mail->setSubject($mailtp->getSubject());
+ $mail->send();
$formdata['content']='';
}
} elseif ($user) {
@@ -673,16 +671,24 @@ class DataController extends Zend_Controller_Action
if (empty($uuid)) die();
$sql="select * from comments where uuid=? order by id desc";
$comments=$this->db->fetchAll($sql,array($uuid));
- if ($comments)
+
+ $paginator = Zend_Paginator::factory($comments);
+ $paginator->setCurrentPageNumber($this->_getParam('page'));
+ $paginator->setItemCountPerPage(5);
+ $paginator->setView($this->view);
+ Zend_View_Helper_PaginationControl::setDefaultViewPartial('data/pagination_ajax.phtml');
+
+ if ($paginator)
{
- foreach($comments as $c)
+ foreach($paginator as $c)
{
//$author=$this->view->escape($c['author']);
$author=$c['author'];
$author=($c['userid'])?"".$author."":$author;
$author=($c['url'])?''.$author.'':$author;
- print "
Li X, Nan ZT, Cheng GD, Ding YJ, Wu LZ, Wang LX, Wang J, Ran YH, Li HX, Pan XD, Zhu ZM. Toward an improved data stewardship and service for environmental and ecological science data in west China. International Journal of Digital Earth, 2011, 4(4): 347-359. DOI: 10.1080/17538947.2011.558123.
+
+
+
+
数据相关文献
+refs) : ?>
+page->getNavigation(); ?>
+
+
+ refs as $md) : ?>
+
下载';
+}
+ ?>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/application/default/views/scripts/heihe/navi.phtml b/application/default/views/scripts/heihe/navi.phtml
index a4fb4f09..24373201 100644
--- a/application/default/views/scripts/heihe/navi.phtml
+++ b/application/default/views/scripts/heihe/navi.phtml
@@ -22,6 +22,7 @@
\ No newline at end of file
diff --git a/application/default/views/scripts/heihe/tag.phtml b/application/default/views/scripts/heihe/tag.phtml
index b3a6f531..8889beb3 100755
--- a/application/default/views/scripts/heihe/tag.phtml
+++ b/application/default/views/scripts/heihe/tag.phtml
@@ -16,6 +16,7 @@ $this->breadcrumb()->setSeparator(' > ');
diff --git a/application/default/views/scripts/heihe/timemap.phtml b/application/default/views/scripts/heihe/timemap.phtml
index fad998c9..02d71e6f 100644
--- a/application/default/views/scripts/heihe/timemap.phtml
+++ b/application/default/views/scripts/heihe/timemap.phtml
@@ -48,7 +48,7 @@ window.onload=function() {
"title" : "",
"options" : {
// set the full HTML for the info window
- "infoHtml": "
+
\ No newline at end of file
diff --git a/application/default/views/scripts/review/navi.phtml b/application/default/views/scripts/review/navi.phtml
new file mode 100644
index 00000000..083b64ec
--- /dev/null
+++ b/application/default/views/scripts/review/navi.phtml
@@ -0,0 +1,23 @@
+
+
+
\ No newline at end of file
diff --git a/application/default/views/scripts/review/review.phtml b/application/default/views/scripts/review/review.phtml
index 0704de5e..0d248692 100755
--- a/application/default/views/scripts/review/review.phtml
+++ b/application/default/views/scripts/review/review.phtml
@@ -22,7 +22,7 @@
-
/>"
+ "infoHtml": ">
/>"
}
},
diff --git a/application/default/views/scripts/data/tmp.js b/application/default/views/scripts/data/tmp.js
deleted file mode 100755
index 6509e348..00000000
--- a/application/default/views/scripts/data/tmp.js
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
diff --git a/application/default/views/scripts/data/tools.phtml b/application/default/views/scripts/data/tools.phtml
index fb7dd85d..31c56fe4 100755
--- a/application/default/views/scripts/data/tools.phtml
+++ b/application/default/views/scripts/data/tools.phtml
@@ -1,11 +1,28 @@
+
+
\ No newline at end of file
diff --git a/application/default/views/scripts/data/view.phtml b/application/default/views/scripts/data/view.phtml
index 60d99f58..731cebfc 100755
--- a/application/default/views/scripts/data/view.phtml
+++ b/application/default/views/scripts/data/view.phtml
@@ -8,10 +8,11 @@
$this->breadcrumb(''.$this->config->title->data.'');
$this->breadcrumb('Details');
$this->breadcrumb()->setSeparator(' > ');
- $this->headScript()->appendFile('http://maps.google.com/maps?file=api&v=2&key='.$this->config->google->maps->api);
+ $this->headScript()->appendFile('http://maps.google.cn/maps?file=api&v=2&key='.$this->config->google->maps->api);
$this->headScript()->appendFile('/js/prototype.js');
$this->headScript()->appendFile('/js/OpenLayers.js');
- $this->headScript()->appendFile('/js/window.js');
+ $this->headScript()->appendFile('/js/window.js');
+ $this->headScript()->appendFile('/js/pubfunc.js');
$this->headLink()->appendStylesheet('/js/theme/default/style.css');
?>
metadata;if ($md):?>
@@ -22,7 +23,7 @@ if ($md->title_en) echo '
+datatype) : ?>
+
评论加载中
+ 
- 
".($c['content'])."