diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php index ed125cf4..500ce89a 100755 --- a/application/admin/controllers/DataController.php +++ b/application/admin/controllers/DataController.php @@ -1,6 +1,9 @@ 数据目录成功导入!'; - } else if ($row['host']=='ftp2.westgis.ac.cn') + } else if ($row['host']=='ftp.sanjiangyuan.org.cn') { - file_get_contents("http://ftp2.westgis.ac.cn/proftp_upload.php?uuid=".$uuid."&filelist=1"); + file_get_contents("http://ftp.sanjiangyuan.org.cn/proftp_upload.php?uuid=".$uuid."&filelist=1"); echo '

数据目录成功导入!

'; } else { echo '

数据目录未导入!

'; @@ -1126,6 +1129,7 @@ class Admin_DataController extends Zend_Controller_Action $keyword = $this->view->q = trim($this->_getParam('q')); $order = $this->view->search_order = trim($this->_getParam('order')); $sort = $this->view->search_sort = trim($this->_getParam('sort')); + $field = $this->view->search_field = $this->_getParam('field'); $reference = new Reference(); @@ -1134,6 +1138,11 @@ class Admin_DataController extends Zend_Controller_Action $reference->keyword = $keyword; } + if(!empty($field)) + { + $reference->field = $field; + } + if(!empty($order)) { $reference->order = $order; @@ -1144,19 +1153,40 @@ class Admin_DataController extends Zend_Controller_Action $reference->sort = $sort; } + $this->view->reference = $reference; + $this->view->page = $this->_getParam('page'); + $this->view->pagelimit = 12; + //文献首页 if(empty($ac)) { - $this->view->referenceType = $reference->referenceType(); - view::addPaginator($reference->fetchReferences(),$this,12); + $this->view->referenceType = $reference->referenceType(); + view::addPaginator($reference->fetchReferences(),$this, $this->view->pagelimit); + $this->view->years = $reference->countByYear(); return true; } else if ($ac == "water") { $this->view->referenceType = $reference->referenceType(); - view::addPaginator($reference->fetchThemeReferences('water'),$this,10); + view::addPaginator($reference->fetchThemeReferences('water'),$this,$this->view->pagelimit); return true; } + else if ($ac == "westdc") + { + $this->view->referenceType = $reference->referenceType(); + view::addPaginator($reference->fetchWestdcReferences(),$this,$this->view->pagelimit); + return true; + } + else if ($ac == "todo") + { + $this->view->referenceType = $reference->referenceType(); + view::addPaginator($reference->fetchTodoReferences(),$this,$this->view->pagelimit); + return true; + } + + unset($this->view->reference); + unset($this->view->page); + unset($this->view->pagelimit); //添加 if($ac == "add") @@ -1326,6 +1356,81 @@ class Admin_DataController extends Zend_Controller_Action } } + //ris更新单篇 + if($ac == "singleris") + { + $this->_helper->viewRenderer('ref-singleris'); + $id = (int)$this->_getParam('id'); + $this->view->ristext = $this->_getParam('ristext'); + + if($id < 1) + { + view::Post($this,"参数错误!",-1); + return true; + } + + $this->view->referenceData = $reference->getOneReferenceData($id); + + if(!empty($submit)) + { + $ris = new Ris(); + $data = $ris->loadout(); + + if(count($data) < 1) + { + view::Post($this,"输入的RIS信息有误".'查看详细',-1); + return true; + } + + if($ris->updateWithRis($id,$data[0]) === true) + { + view::Post($this,"编辑成功!".'查看详细',-2); + return true; + }else{ + view::Post($this,"编辑失败!".'查看详细',-1); + return true; + } + } + + return true; + }//ris单篇更新 + + //ris导出 + if($ac == "risoutput") + { + $this->_helper->viewRenderer('ref-risoutput'); + $this->view->years = $reference->countByYear(); + + if(!empty($submit)) + { + $mode = $this->_getParam('mode'); + + $risOutput = new RisOutput(); + $preData = $risOutput->preRead($mode); + + $risData = $risOutput->processArrayDataToRisData($preData); + + $risText = $risOutput->output($risData); + + echo "
";
+				echo $risText;
+				echo "
"; + } + }//ris output + + if($ac == "ristest") + { + $this->_helper->viewRenderer('ref-ris'); + $submit = $this->_getParam('submit'); + + if(!empty($submit)) + { + $ris = new \Reference\Ris(); + view::Dump($ris->processRis(NULL,$this->_getParam('ristext')),false); + } + } + + }//文献管理 refAction() /* @@ -1788,8 +1893,8 @@ class Admin_DataController extends Zend_Controller_Action $id = $this->_getParam('attupdate'); - $files=new files(); - $msg = $files -> upload($this->view->config->upload,$_FILES['Filedata'],empty($uuid)?'file':'md'); + $files=new Files(); + $msg = $files -> upload($_FILES['Filedata'],empty($uuid)?'file/':'md/',true); if(empty($msg['error'])) { @@ -1797,7 +1902,7 @@ class Admin_DataController extends Zend_Controller_Action $filename = $msg['db_path']; $filesize = $msg['file_size']; $filedesc = $this->_request->getParam('filedesc'); - $filetype = $msg['file_type']; + $filetype = 'md'; $realname = $msg['realname']; @@ -2116,8 +2221,8 @@ class Admin_DataController extends Zend_Controller_Action exit(); } - $files=new files(); - $msg = $files -> upload($this->view->config->upload,$_FILES['Filedata'],empty($uuid)?'file':'md'); + $files=new Files(); + $msg = $files -> upload($_FILES['Filedata'],empty($uuid)?'file/':'md/',true); if(empty($msg['error'])) { @@ -2125,7 +2230,7 @@ class Admin_DataController extends Zend_Controller_Action $filename = $msg['db_path']; $filesize = $msg['file_size']; $filedesc = $this->_request->getParam('filedesc'); - $filetype = $msg['file_type']; + $filetype = 'md'; $realname = $msg['realname']; @@ -2184,10 +2289,6 @@ class Admin_DataController extends Zend_Controller_Action $rs = $this->db->query($sql); $atts = $rs->fetchAll(); - foreach($atts as $k=>$v) - { - $atts[$k]['html']= $v['realname'].'['. round($v['filesize']/1024,2) .' kb]
'; - } echo Zend_Json::encode($atts); exit(); }else @@ -2209,6 +2310,7 @@ class Admin_DataController extends Zend_Controller_Action $ac = $this->_request->getParam('ac'); $uuid = $this->_request->getParam('uuid'); + set_time_limit(0); $auth = Zend_Auth::getInstance(); if($auth->hasIdentity()) @@ -2566,7 +2668,7 @@ class Admin_DataController extends Zend_Controller_Action unset($mailtp); //email to author $mail=new WestdcMailer($this->view->config->smtp); - $mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); + $mail->setFrom($this->view->config->service->email,'数据服务组'); $mailtp=new EmailText($this->db,"version-commit-author",array( 'user' => $user->username, 'uuid' => $row['uuid'], @@ -2620,7 +2722,7 @@ class Admin_DataController extends Zend_Controller_Action unset($mailtp); //email to author $mail=new WestdcMailer($this->view->config->smtp); - $mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); + $mail->setFrom($this->view->config->service->email,'数据服务组'); $mailtp=new EmailText($this->db,"version-commit-author",array( 'user' => $user->username, 'uuid' => $row['uuid'], @@ -2686,7 +2788,7 @@ class Admin_DataController extends Zend_Controller_Action //email to admin & author $mail=new WestdcMailer($this->view->config->smtp); - $mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); + $mail->setFrom($this->view->config->service->email,'数据服务组'); $mailtp=new EmailText($this->db,"metadata-release",array( 'user' => $user->username, 'uuid' => $row['uuid'], @@ -3837,6 +3939,22 @@ class Admin_DataController extends Zend_Controller_Action }//fund + public function visualAction() + { + $uuid = $this->_getParam('uuid'); + $submit = $this->_getParam('submit'); + + if(!empty($uuid)) + { + $this->_helper->viewRenderer('visual-add'); + $this->view->data = ['uuid' => $uuid]; + if(empty($submit)) + return true; + + + } + } + public function doiAction() { $ac = $this->_getParam('ac'); @@ -3899,6 +4017,11 @@ class Admin_DataController extends Zend_Controller_Action }else{ $this->view->data['doi'] = $metadata['doi']; $this->view->data['info'] = $doi->data_process_out($this->view->data); + if(empty($this->view->data['ts_published'])) + { + $this->view->data['title'] = $metadata['title']; + $this->view->data['title_en'] = $metadata['title_en']; + } } }else{ $this->view->data = $doi->view($uuid); diff --git a/application/admin/controllers/DownController.php b/application/admin/controllers/DownController.php index b28592ff..bb8072c9 100644 --- a/application/admin/controllers/DownController.php +++ b/application/admin/controllers/DownController.php @@ -4,6 +4,7 @@ use Files\Files; use Files\Output; use Files\Listener\FileListener; use Order\Manager\Offlineapp; +use Order\Manager\Application; use data\DataService; use Mail\Mail; @@ -374,8 +375,8 @@ class Admin_DownController extends Zend_Controller_Action $mail->setSubject($mailtp->getSubject()); $addrs=array(); $addrs[] = 'nztong@lzb.ac.cn'; - $addrs[] = 'wjian@lzb.ac.cn'; - $addrs[] = 'lixin@lzb.ac.cn'; + $addrs[] = 'wangliangxu@lzb.ac.cn'; + $addrs[] = 'wulizong@lzb.ac.cn'; $mail->addTo($addrs); $mail->addCc($this->view->config->service->email,'西部数据中心服务组'); $mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, 'offlineapp.pdf'); @@ -581,7 +582,7 @@ class Admin_DownController extends Zend_Controller_Action foreach($rs as $data) { if ($data['host']=='ftp1.westgis.ac.cn') $has_ftp1=true; - if ($data['host']=='ftp2.westgis.ac.cn') + if ($data['host']=='ftp.sanjiangyuan.org.cn') $has_ftp2=true; // deal with ftp.westgis.ac.cn, use g6 to add path @@ -594,7 +595,7 @@ class Admin_DownController extends Zend_Controller_Action if ($has_ftp1) { $user=(object)array("id"=>$row['userid'], - "username"=>"westdc_".$row['userid'], + "username"=>"sjy_".$row['userid'], "password"=>$password, "time"=>date('Y-m-d H:i:s', strtotime('+2 week')), //"path"=>$path, @@ -621,12 +622,12 @@ class Admin_DownController extends Zend_Controller_Action if ($has_ftp2) { $user=(object)array("id"=>$row['userid'], - "username"=>"westdc_".$row['userid'], + "username"=>"sjy_".$row['userid'], "password"=>$password, "time"=>date('Y-m-d H:i:s', strtotime('+2 week')), //"path"=>$path, "param"=>"offlineappid=".$finish, - "host"=>'ftp2.westgis.ac.cn', + "host"=>'ftp.sanjiangyuan.org.cn', "maxdata"=>$this->view->config->download->max, "datacount"=>1 //represent one offline application ); @@ -649,10 +650,10 @@ class Admin_DownController extends Zend_Controller_Action $ftphost='ftp://ftp1.westgis.ac.cn'; } else if (!$has_ftp1 && $has_ftp2) { - $ftphost='ftp://ftp2.westgis.ac.cn'; + $ftphost='ftp://ftp.sanjiangyuan.org.cn'; } else if ($has_ftp1 && $has_ftp2) { - $ftphost='ftp://ftp1.westgis.ac.cn 以及 ftp://ftp2.westgis.ac.cn'; + $ftphost='ftp://ftp1.westgis.ac.cn 以及 ftp://ftp.sanjiangyuan.org.cn'; } //发送用户邮件进行信息提示和说明 $mail = new WestdcMailer($this->view->config->smtp); @@ -874,8 +875,10 @@ class Admin_DownController extends Zend_Controller_Action if ($form->isValid($formdata)) { $uploadedData = $form->getValues(); $pdf = basename($form->pdf->getFileName()); - $sql="insert into offlineapp (username,email,unit,phone,address,postcode,project,pdflink,datalist,ts_created,ts_approved) values(?,?,?,?,?,?,?,?,?,?,now())"; - $this->db->query($sql,array($formdata['username'],$formdata['email'],$formdata['unit'],$formdata['phone'],$formdata['address'],$formdata['postcode'],$formdata['project'],$pdf,$formdata['datalist'],$formdata['ts_approved'])); + $sql="insert into offlineapp (username,email,unit,phone,address,postcode,project,pdflink,datalist,ts_created,ts_approved,project_id,project_title,project_type) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + $this->db->query($sql,array($formdata['username'],$formdata['email'],$formdata['unit'],$formdata['phone'],$formdata['address'],$formdata['postcode'], + $formdata['project'],$pdf,$formdata['datalist'],$formdata['ts_approved']),$formdata['ts_approved'], + $formdata['project_id'],$formdata['project_title'],$formdata['project_type']); $this->messenger->addMessage('提示信息:您已经成功添加该离线服务记录。'); $this->_redirect('/admin/down/offline'); } else { @@ -896,11 +899,14 @@ class Admin_DownController extends Zend_Controller_Action $pdf = basename($form->pdf->getFileName()); $sql="update offlineapp set username=?,email=?,unit=?,phone=?,address=?,postcode=?,project=?,"; if ($form->pdf->isUploaded()) $sql.="pdflink=?,"; - $sql.="datalist=?,ts_approved=? where id=?"; + $sql.="datalist=?,ts_approved=?,project_id=?,project_title=?,project_type=? where id=?"; $param=array($formdata['username'],$formdata['email'],$formdata['unit'],$formdata['phone'],$formdata['address'],$formdata['postcode'],$formdata['project']); if ($form->pdf->isUploaded()) $param[]=$pdf; $param[]=$formdata['datalist']; $param[]=$formdata['ts_approved']; + $param[]=$formdata['project_id']; + $param[]=$formdata['project_title']; + $param[]=$formdata['project_type']; $param[]=$edit; $this->db->query($sql,$param); $this->messenger->addMessage('提示信息:您已经编辑添加该记录。'); @@ -1049,9 +1055,15 @@ class Admin_DownController extends Zend_Controller_Action //设置当前活动sheet的名称 $objActSheet->setTitle('离线服务记录'); + if (date('m')==1) + { + $ym=(date('Y')-1).'-12-1'; + } else { + $ym=date('Y-').(date('m')-1).'-1'; + } $sql="select o.username,o.unit,o.phone,o.address,o.postcode,o.project,regexp_replace(o.datalist,'\(.+?MB\)','','g') as datalist,date(o.ts_approved) as date,o.email,o.project_id,o.project_type,o.project_title,sum(m.filesize) as filesize from offlineapp o left join dataorder d on o.id=d.offlineappid left join metadata m on d.uuid=m.uuid - where o.ts_approved>='".date('Y-').(date('m')-1)."-1' and o.ts_approved<'".date('Y-m')."-1' and o.pdflink is not null and o.ts_approved is not null and d.status=5 group by o.id order by o. ts_approved + where o.ts_approved>='".$ym."' and o.ts_approved<'".date('Y-m')."-1' and o.pdflink is not null and o.ts_approved is not null and d.status=5 group by o.id order by o. ts_approved "; $re = $this->db->query($sql); $rows = $re->fetchAll(); @@ -1080,7 +1092,7 @@ class Admin_DownController extends Zend_Controller_Action $objActSheet->setTitle('在线服务记录'); $sql="select o.username,o.unit,o.phone,o.address,o.postcode,o.project,date(o.ts_created) as date,o.email,o.project_id,o.project_type,o.project_title,m.filesize,m.title from onlineapp o left join dataorder d on o.id=d.onlineappid left join metadata m on d.uuid=m.uuid - where o.ts_created>='".date('Y-').(date('m')-1)."-1' and o.ts_created<'".date('Y-m')."-1' and d.status=0 order by o. ts_created + where o.ts_created>='".$ym."' and o.ts_created<'".date('Y-m')."-1' and d.status=0 order by o. ts_created "; $re = $this->db->query($sql); $rows = $re->fetchAll(); @@ -1137,16 +1149,15 @@ class Admin_DownController extends Zend_Controller_Action ->setBody($objWriter->save('php://output'));*/ } - $select=$this->db->select(); - $select->from('offlineapp')->where('ts_approved is not null')->where('pdflink is not null')->where('status>=0')->order('ts_created desc'); - $paginator = Zend_Paginator::factory($select); - $paginator->setCurrentPageNumber($this->_getParam('page')); - $paginator->setItemCountPerPage($this->view->config->page->max); - $paginator->setView($this->view); - Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination.phtml'); - $this->view->paginator=$paginator; - $this->view->page = $this->_getParam('page'); + + $application = new Application(); + + $this->view->q = $application->keyword = $this->_getParam('q'); + $application->filter = $this->_getParam('filter'); + view::addPaginator($application->passed(),$this,20); + + return true; } //在线数据下载情况,仅针对onlineapp表,自2011-9-8开始记录。 function onlineAction() @@ -1364,7 +1375,7 @@ class Admin_DownController extends Zend_Controller_Action $sql = "select distinct u.email from dataorder d LEFT JOIN users u on d.userid = u.id - WHERE u.email IS NOT NULL + WHERE u.email IS NOT NULL and d.status in (0,5) and d.ts_approved is not null AND d.uuid=? GROUP BY u.email"; diff --git a/application/admin/controllers/ReviewController.php b/application/admin/controllers/ReviewController.php index 001217bf..632e7eb6 100644 --- a/application/admin/controllers/ReviewController.php +++ b/application/admin/controllers/ReviewController.php @@ -761,7 +761,7 @@ class Admin_ReviewController extends Zend_Controller_Action if (is_numeric($ids)) { $sql="select distinct u.email,m.title,m.uuid from mdstatus s left join metadata m on s.uuid=m.uuid - left join mdauthor a on s.uuid=a.uuid left join users u on a.userid=u.id where s.id=? order by u.email"; + right join mdauthor a on s.uuid=a.uuid left join users u on a.userid=u.id where s.id=? order by u.email"; $rs=$this->db->query($sql,array($ids)); $rows=$rs->fetchAll(); if ($rows) @@ -805,9 +805,10 @@ class Admin_ReviewController extends Zend_Controller_Action $this->view->keyword = $keyword; } - $sql = "select m.id,md.title,md.uuid,u.username,u.realname,m.status,m.ts_created from mdstatus m + $sql = "select m.id,md.title,md.uuid,u.username,u.realname,m.status,m.ts_created,gn.id as gnid from mdstatus m right join metadata md on md.uuid=m.uuid left join users u on u.id=m.userid + left join geonetworkmetadata gn on m.uuid=gn.uuid where status=0 $searchjoin order by m.ts_created desc"; $re = $this->db->query($sql); @@ -909,7 +910,7 @@ class Admin_ReviewController extends Zend_Controller_Action $sql = "select m.id,md.title,md.uuid,u.username,u.realname,m.status,m.ts_finished from mdstatus m right join metadata md on md.uuid=m.uuid left join users u on u.id=m.userid - where status=5 $searchjoin"; + where status=5 $searchjoin order by m.ts_finished desc"; $re = $this->db->query($sql); $rows = $re->fetchAll(); diff --git a/application/admin/controllers/StatController.php b/application/admin/controllers/StatController.php index 5df02b1c..4fa24839 100644 --- a/application/admin/controllers/StatController.php +++ b/application/admin/controllers/StatController.php @@ -1,437 +1,456 @@ -db=Zend_Registry::get('db'); - $this->view->config = Zend_Registry::get('config'); - $this->messenger=$this->_helper->getHelper('FlashMessenger'); - $this->view->messages = $this->messenger->getMessages(); - $this->view->theme = new Theme(); - $this->_helper->layout->setLayout('administry'); - } - function postDispatch() - { - $this->view->messages = $this->messenger->getMessages(); - } - function indexAction() - { - $sql="select (select count(id) from users) as alluser, - (select count(id) from normalmetadata) as alldata, - (select count(id) as num from dataorder where status=0) as onlinedown, - (select count(id) as num from dataorder where status=5) as offlinedown, - (select count(id) as num from offlineapp where ts_approved is not null) as offlinepass, - (select count(id) as num from offlineapp where ts_approved is null) as offlineunfinished, - (select count(id) as num from dataorder where offlineappid>0 and status=-1) as offlinedenied, - (select count(id) as num from onlineapp) as onlineapp"; - $this->view->stat=$this->db->fetchRow($sql); - - //下载量统计 - $sql = "select sum(num) as num from (select m.filesize/1024 as num,m.title,d.userid from dataorder d left join metadata m on d.uuid=m.uuid where (d.status=0 or d.status=5) and m.filesize>0 group by m.title,d.userid,m.filesize) as t"; - $res = $this->db->query($sql); - $allsize = $res->fetch(); - $this->view->allsize = $allsize; - - $sql = "select sum(num) as num from (select m.filesize/1024 as num,m.title,d.userid from dataorder d left join metadata m on d.uuid=m.uuid where d.status=5 and m.filesize>0 group by m.title,d.userid,m.filesize) as t"; - $res = $this->db->query($sql); - $offlinesize = $res->fetch(); - $this->view->offlinesize = $offlinesize; - - $sql = "select sum(num) as num from (select m.filesize/1024 as num,m.title,d.userid from dataorder d left join metadata m on d.uuid=m.uuid where d.status=0 and m.filesize>0 group by m.title,d.userid,m.filesize) as t"; - $res = $this->db->query($sql); - $onlinesize = $res->fetch(); - $this->view->onlinesize = $onlinesize; - - $sql="select sum(configvalue::real)/1024/1024/1024 as num from g6ftpusersettings where userid in (select id from g6ftpusers where name like 'westdc%' or name='newwestdc') and configname='StatsDownloaded'"; - $res = $this->db->query($sql); - $onlinesize = $res->fetch(); - $this->view->onlineg6size = $onlinesize; - - - }//indexAction 首页 - - function unitAction() - { - $ac = $this->_getParam('ac'); - $y = (int)$this->_request->getParam('y'); - - if(!empty($y)) - { - $n = date("Y",time()); - if($y<2004 || $y>$n) - { - $y=$n; - } - } - $this->view->y = $y; - - //各单位下载情况,统计的离线申请数据条数,需要有对应的dataorder记录 - /*$sql = "select count(d.id) as num,o.unit from dataorder d - left join offlineapp o on o.id=d.offlineappid - where d.offlineappid>0 and o.unit is not null and d.status>4";*/ - //各单位下载情况,统计的离线申请数据次数 - $sql = "select count(o.id) as num,o.unit from offlineapp o - where o.unit is not null "; - if ($y) - $sql.=" and extract(year from o.ts_created)='$y'"; - $sql.=" group by o.unit"; - $fe = $this->db->query($sql); - $unitoffline = $fe->fetchAll(); - - //各单位在线下载情况 - $sql = "select count(d.id) as num,o.unit from dataorder d - left join onlineapp o on o.id=d.onlineappid - where d.onlineappid>0 and o.unit is not null"; - if ($y) - $sql.=" and extract(year from o.ts_created)='$y'"; - $sql.=" group by o.unit"; - $fe = $this->db->query($sql); - $unitonline = $fe->fetchAll(); - - $units = array(); - - foreach($unitonline as $k=>$v) - { - if(isset($v['num'])) - { - $units[$v['unit']]['online'] = $v['num']; - } - } - - foreach($unitoffline as $k=>$v) - { - if(isset($v['num'])) - { - $units[$v['unit']]['offline'] = $v['num']; - } - } - - $index = 1; - - foreach($units as $k=>$v) - { - if(!isset($v['online'])) - { - $units[$k]['online'] = 0; - } - - if(!isset($v['offline'])) - { - $units[$k]['offline'] = 0; - } - - $units[$k]['total'] = $units[$k]['online'] + $units[$k]['offline']; - - $units[$k]['index'] = $index++; - } - - if($ac == "out") - { - $type = $this->_getParam('type'); - - if(empty($type) || $type == "csv") - { - $this->_helper->layout->disableLayout(); - $this->_helper->viewRenderer->setNoRender(); - - include_once("Stat.php"); - $stat = new Stat($this->db); - - $head = array("id","单位名称","离线申请次数","在线申请次数","总申请次数"); - - $content = array(); - - foreach($units as $k=>$v) - { - $content[] = array( - $v['index'], - $k, - $v['offline'], - $v['online'], - $v['total'] - ); - unset($units[$k]); - } - - array_unshift($content,$head); - - $stat->Download("westdc-download-status.csv",$content,"csv"); - exit(); - } - - if($type == "json") - { - $this->_helper->layout->disableLayout(); - $this->_helper->viewRenderer->setNoRender(); - - include_once("Stat.php"); - $stat = new Stat($this->db); - - $content = array(); - - foreach($units as $k=>$v) - { - $content[] = array( - 'index'=>$v['index'], - 'unit'=>$k, - 'offline'=>$v['offline'], - 'online'=>$v['online'], - 'total'=>$v['total'] - ); - unset($units[$k]); - } - - $stat->Download("westdc-download-status.json",$content,"json"); - exit(); - } - - } - - $this->view->units = $units; - - - }//分单位统计 - - //按用户统计 - function userAction(){ - - $ac = $this->_getParam('ac'); - - if($ac == "get") - { - $this->_helper->layout->disableLayout(); - $this->_helper->viewRenderer->setNoRender(); - - include_once("Stat.php"); - $stat = new Stat($this->db); - - $rows = $stat->UserDataorder(); - - $down = $this->_getParam('down'); - if(empty($down)) - { - $this->jsonexit(array("aaData"=>$rows)); - return true; - } - - if($down == "csv") - { - - $this->_helper->layout->disableLayout(); - $this->_helper->viewRenderer->setNoRender(); - - $head = array("id","姓名","离线申请次数","在线申请次数","总申请次数"); - - array_unshift($rows,$head); - - $stat->Download("westdc-download-status.csv",$rows,"csv"); - exit(); - - } - - if($down == "json") - { - - $this->_helper->layout->disableLayout(); - $this->_helper->viewRenderer->setNoRender(); - - /* - $head = array("id","姓名","离线申请次数","在线申请次数","总申请次数"); - - array_unshift($rows,$head); - */ - - $stat->Download("westdc-download-status.json",$rows,"json"); - exit(); - } - - } - - }//userAction() - - function monthAction(){ - - $y = (int)$this->_request->getParam('y'); - - if(!empty($y)) - { - $n = date("Y",time()); - if($y<2004 || $y>$n) - { - $y=$n; - } - } - $this->view->y = $y; - $sql = "select count(extract(month from ts_created)) as c,extract(month from ts_created) as m,extract(year from ts_created) as y from onlineapp - where id in (select distinct(onlineappid) from dataorder)"; - if ($y) - $sql.=" and extract(year from ts_created)='$y' "; - $sql.=" group by extract(month from ts_created),extract(year from ts_created) - order by extract(year from ts_created),extract(month from ts_created)"; - $rs = $this->db->query($sql); - $rows = $rs->fetchAll(); - - $this->view->data = $rows; - - $sql = "select count(extract(month from ts_created)) as c,extract(month from ts_created) as m,extract(year from ts_created) as y from dataorder - where status=0"; - if ($y) - $sql.=" and extract(year from ts_created)='$y' "; - $sql.=" group by extract(month from ts_created),extract(year from ts_created) - order by extract(year from ts_created),extract(month from ts_created)"; - $rs = $this->db->query($sql); - $rows = $rs->fetchAll(); - $this->view->online = $rows; - - $sql = "select count(extract(month from ts_created)) as c,extract(month from ts_created) as m,extract(year from ts_created) as y from offlineapp - where ts_approved is not null"; - if ($y) - $sql.=" and extract(year from ts_created)='$y' "; - $sql.=" group by extract(month from ts_created),extract(year from ts_created) - order by extract(year from ts_created),extract(month from ts_created)"; - $rs = $this->db->query($sql); - $rows = $rs->fetchAll(); - - if(count($rows)<=0) - { - $this->view->offline=""; - } - - $this->view->offline = $rows; - - $sql = "select count(extract(month from ts_created)) as c,extract(month from ts_created) as m,extract(year from ts_created) as y from users"; - if ($y) - $sql.=" where extract(year from ts_created)='$y' "; - $sql.=" group by extract(month from ts_created),extract(year from ts_created) - order by extract(year from ts_created),extract(month from ts_created)"; - $rs = $this->db->query($sql); - $rows = $rs->fetchAll(); - if(count($rows)<=0) - { - $this->view->newuser=""; - } - - $this->view->newuser = $rows; - - - - }//按月份统计 - - function awstatswebAction() - { - - }//awstats web 统计 - - function awstatsweb2Action() - { - - }//awstats web 统计 - - function awstatsftpAction() - { - - }//awstats ftp 统计 - - function awstatsftp2Action() - { - - }//awstats ftp 统计 - - function webalizerAction() - { - - }//webalizer 统计 - - function waterAction() - { - - $sql="select count(k.keyword) as num,d.status,k.keyword from dataorder d left join metadata m on d.uuid=m.uuid - left join keyword k on m.id=k.id - where (d.status=5 or d.status=-1) and m.source='0595169a-279e-4b95-819f-129d0ba4280d' - and (k.keyword='航空遥感' or k.keyword='卫星遥感' or k.keyword='气象水文' or k.keyword='上游寒区水文试验区' or k.keyword='森林水文试验区' or k.keyword='中游干旱区水文试验区') - group by k.keyword,d.status order by k.keyword desc,d.status desc"; - - $re =$this->db->query($sql); - $type =$re->fetchAll();//按分类 - - $this->view->type = $type; - - $sql="select count(extract(month from o.ts_created)) as c,extract(month from o.ts_created) as m,extract(year from o.ts_created) as y - from offlineapp o left join dataorder d on d.offlineappid=o.id left join metadata m on m.uuid=d.uuid - where m.source='0595169a-279e-4b95-819f-129d0ba4280d' and (d.status=3 or d.status=5 or d.status=-1) - group by extract(month from o.ts_created),extract(year from o.ts_created) - order by extract(year from o.ts_created),extract(month from o.ts_created)"; - - $re=$this->db->query($sql); - $month=$re->fetchAll(); - - $this->view->month = $month; - - $sql = "select - extract(year from o.ts_created) as y,extract(month from o.ts_created) as m, - count(extract(month from o.ts_created)) as c - from - (select distinct(o.id),o.ts_created - from offlineapp o where o.datalist like '%黑河综合遥感联合试验%') as o - group by extract(month from o.ts_created),extract(year from o.ts_created) - order by extract(year from o.ts_created),extract(month from o.ts_created)"; - - $re=$this->db->query($sql); - $order=$re->fetchAll(); - - $this->view->order = $order; - - $sql = "select (sum(m.filesize)/1024) as n from dataorder d left join metadata m on d.uuid=m.uuid - where d.status=5 and m.source='0595169a-279e-4b95-819f-129d0ba4280d'"; - - $re=$this->db->query($sql); - $num=$re->fetchAll(); - - $this->view->num=$num; - - - $sql = "select count(lower(o.unit)) as c,lower(o.unit) as u - from offlineapp o left join dataorder d on d.offlineappid=o.id left join metadata m on m.uuid=d.uuid - where m.source='0595169a-279e-4b95-819f-129d0ba4280d' and (d.status=5) - group by lower(o.unit) - order by lower(o.unit)"; - - $re=$this->db->query($sql); - $units=$re->fetchAll(); - - $this->view->units=$units; - - - $sql = "select count(t.unit) as c,t.unit from - (select distinct(o.id),o.unit - from offlineapp o left join dataorder d on d.offlineappid=o.id left join metadata m on m.uuid=d.uuid - where m.source='0595169a-279e-4b95-819f-129d0ba4280d' and (d.status=5) - ) as t - group by t.unit"; - - $re = $this->db->query($sql); - $ounit= $re->fetchAll(); - - $this->view->ounit = $ounit; - - //water 项目按月统计下载量 - $sql = "select (sum(m.filesize)/1024) as n,extract(month from d.ts_created) as m,extract(year from d.ts_created) as y from dataorder d left join metadata m on d.uuid=m.uuid - where d.status=5 and m.source='0595169a-279e-4b95-819f-129d0ba4280d' - group by extract(month from d.ts_created),extract(year from d.ts_created) - order by extract(year from d.ts_created),extract(month from d.ts_created)"; - - $re = $this->db->query($sql); - $dm = $re->fetchAll(); - - $this->view->dm = $dm; - - - }//WATER项目 - - public function jsonexit($data){ - $this->getResponse()->setHeader('Content-Type', 'application/json')->appendBody(json_encode($data,JSON_NUMERIC_CHECK)); - return true; - }//jsonexit() 退出并返回json数据 - -} - +db=Zend_Registry::get('db'); + $this->view->config = Zend_Registry::get('config'); + $this->messenger=$this->_helper->getHelper('FlashMessenger'); + $this->view->messages = $this->messenger->getMessages(); + $this->view->theme = new Theme(); + $this->_helper->layout->setLayout('administry'); + } + function postDispatch() + { + $this->view->messages = $this->messenger->getMessages(); + } + function indexAction() + { + $sql="select (select count(id) from users) as alluser, + (select count(id) from normalmetadata) as alldata, + (select count(id) as num from dataorder where status=0) as onlinedown, + (select count(id) as num from dataorder where status=5) as offlinedown, + (select count(id) as num from offlineapp where ts_approved is not null) as offlinepass, + (select count(id) as num from offlineapp where ts_approved is null) as offlineunfinished, + (select count(id) as num from dataorder where offlineappid>0 and status=-1) as offlinedenied, + (select count(id) as num from onlineapp) as onlineapp"; + $this->view->stat=$this->db->fetchRow($sql); + + //下载量统计 + $sql = "select sum(num) as num from (select m.filesize/1024 as num,m.title,d.userid from dataorder d left join metadata m on d.uuid=m.uuid where (d.status=0 or d.status=5) and m.filesize>0 group by m.title,d.userid,m.filesize) as t"; + $res = $this->db->query($sql); + $allsize = $res->fetch(); + $this->view->allsize = $allsize; + + $sql = "select sum(num) as num from (select m.filesize/1024 as num,m.title,d.userid from dataorder d left join metadata m on d.uuid=m.uuid where d.status=5 and m.filesize>0 group by m.title,d.userid,m.filesize) as t"; + $res = $this->db->query($sql); + $offlinesize = $res->fetch(); + $this->view->offlinesize = $offlinesize; + + $sql = "select sum(num) as num from (select m.filesize/1024 as num,m.title,d.userid from dataorder d left join metadata m on d.uuid=m.uuid where d.status=0 and m.filesize>0 group by m.title,d.userid,m.filesize) as t"; + $res = $this->db->query($sql); + $onlinesize = $res->fetch(); + $this->view->onlinesize = $onlinesize; + + }//indexAction 首页 + + function unitAction() + { + $ac = $this->_getParam('ac'); + $y = (int)$this->_request->getParam('y'); + + if(!empty($y)) + { + $n = date("Y",time()); + if($y<2004 || $y>$n) + { + $y=$n; + } + } + $this->view->y = $y; + + //各单位下载情况,统计的离线申请数据条数,需要有对应的dataorder记录 + /*$sql = "select count(d.id) as num,o.unit from dataorder d + left join offlineapp o on o.id=d.offlineappid + where d.offlineappid>0 and o.unit is not null and d.status>4";*/ + //各单位下载情况,统计的离线申请数据次数 + $sql = "select count(o.id) as num,o.unit from offlineapp o + where o.unit is not null "; + if ($y) + $sql.=" and extract(year from o.ts_created)='$y'"; + $sql.=" group by o.unit"; + $fe = $this->db->query($sql); + $unitoffline = $fe->fetchAll(); + + //各单位在线下载情况 + $sql = "select count(d.id) as num,o.unit from dataorder d + left join onlineapp o on o.id=d.onlineappid + where d.onlineappid>0 and o.unit is not null"; + if ($y) + $sql.=" and extract(year from o.ts_created)='$y'"; + $sql.=" group by o.unit"; + $fe = $this->db->query($sql); + $unitonline = $fe->fetchAll(); + + $units = array(); + + foreach($unitonline as $k=>$v) + { + if(isset($v['num'])) + { + $units[$v['unit']]['online'] = $v['num']; + } + } + + foreach($unitoffline as $k=>$v) + { + if(isset($v['num'])) + { + $units[$v['unit']]['offline'] = $v['num']; + } + } + + $index = 1; + + foreach($units as $k=>$v) + { + if(!isset($v['online'])) + { + $units[$k]['online'] = 0; + } + + if(!isset($v['offline'])) + { + $units[$k]['offline'] = 0; + } + + $units[$k]['total'] = $units[$k]['online'] + $units[$k]['offline']; + + $units[$k]['index'] = $index++; + } + + if($ac == "out") + { + $type = $this->_getParam('type'); + + if(empty($type) || $type == "csv") + { + $this->_helper->layout->disableLayout(); + $this->_helper->viewRenderer->setNoRender(); + + include_once("Stat.php"); + $stat = new Stat($this->db); + + $head = array("id","单位名称","离线申请次数","在线申请次数","总申请次数"); + + $content = array(); + + foreach($units as $k=>$v) + { + $content[] = array( + $v['index'], + $k, + $v['offline'], + $v['online'], + $v['total'] + ); + unset($units[$k]); + } + + array_unshift($content,$head); + + $stat->Download("westdc-download-status.csv",$content,"csv"); + exit(); + } + + if($type == "json") + { + $this->_helper->layout->disableLayout(); + $this->_helper->viewRenderer->setNoRender(); + + include_once("Stat.php"); + $stat = new Stat($this->db); + + $content = array(); + + foreach($units as $k=>$v) + { + $content[] = array( + 'index'=>$v['index'], + 'unit'=>$k, + 'offline'=>$v['offline'], + 'online'=>$v['online'], + 'total'=>$v['total'] + ); + unset($units[$k]); + } + + $stat->Download("westdc-download-status.json",$content,"json"); + exit(); + } + + } + + $this->view->units = $units; + + + }//分单位统计 + + //按用户统计 + function userAction(){ + + $this->view->ac = $ac = $this->_getParam('ac'); + + if($ac == "new") + { + $this->_helper->viewRenderer('user-new'); + $this->view->year = $year = !empty($this->_getParam('year')) ? $this->_getParam('year'):date("Y"); + $this->view->by = $by = !empty($this->_getParam('by')) ? $this->_getParam('by'):"month"; + $userStatistics = new \Statistics\User(); + + if($by == "month") + { + $this->view->data = $userStatistics->getNewUsersByMonth($year); + } + + if($by == "year") + { + $this->view->data = $userStatistics->getNewUsersByYear($year); + } + + if($by == "monthavg") + { + $this->view->data = $userStatistics->getAverageSingupByMonth($year); + } + + return true; + } + + if($ac == "get") + { + $this->_helper->layout->disableLayout(); + $this->_helper->viewRenderer->setNoRender(); + + include_once("Stat.php"); + $stat = new Stat($this->db); + + $rows = $stat->UserDataorder(); + + $down = $this->_getParam('down'); + if(empty($down)) + { + $this->jsonexit(array("aaData"=>$rows)); + return true; + } + + if($down == "csv") + { + + $this->_helper->layout->disableLayout(); + $this->_helper->viewRenderer->setNoRender(); + + $head = array("id","姓名","离线申请次数","在线申请次数","总申请次数"); + + array_unshift($rows,$head); + + $stat->Download("westdc-download-status.csv",$rows,"csv"); + exit(); + + } + + if($down == "json") + { + + $this->_helper->layout->disableLayout(); + $this->_helper->viewRenderer->setNoRender(); + + /* + $head = array("id","姓名","离线申请次数","在线申请次数","总申请次数"); + + array_unshift($rows,$head); + */ + + $stat->Download("westdc-download-status.json",$rows,"json"); + exit(); + } + + } + + }//userAction() + + function monthAction(){ + + $y = (int)$this->_request->getParam('y'); + + if(!empty($y)) + { + $n = date("Y",time()); + if($y<2004 || $y>$n) + { + $y=$n; + } + } + $this->view->y = $y; + $sql = "select count(extract(month from ts_created)) as c,extract(month from ts_created) as m,extract(year from ts_created) as y from onlineapp + where id in (select distinct(onlineappid) from dataorder)"; + if ($y) + $sql.=" and extract(year from ts_created)='$y' "; + $sql.=" group by extract(month from ts_created),extract(year from ts_created) + order by extract(year from ts_created),extract(month from ts_created)"; + $rs = $this->db->query($sql); + $rows = $rs->fetchAll(); + + $this->view->data = $rows; + + $sql = "select count(extract(month from ts_created)) as c,extract(month from ts_created) as m,extract(year from ts_created) as y from dataorder + where status=0"; + if ($y) + $sql.=" and extract(year from ts_created)='$y' "; + $sql.=" group by extract(month from ts_created),extract(year from ts_created) + order by extract(year from ts_created),extract(month from ts_created)"; + $rs = $this->db->query($sql); + $rows = $rs->fetchAll(); + $this->view->online = $rows; + + $sql = "select count(extract(month from ts_created)) as c,extract(month from ts_created) as m,extract(year from ts_created) as y from offlineapp + where ts_approved is not null"; + if ($y) + $sql.=" and extract(year from ts_created)='$y' "; + $sql.=" group by extract(month from ts_created),extract(year from ts_created) + order by extract(year from ts_created),extract(month from ts_created)"; + $rs = $this->db->query($sql); + $rows = $rs->fetchAll(); + + if(count($rows)<=0) + { + $this->view->offline=""; + } + + $this->view->offline = $rows; + + $sql = "select count(extract(month from ts_created)) as c,extract(month from ts_created) as m,extract(year from ts_created) as y from users"; + if ($y) + $sql.=" where extract(year from ts_created)='$y' "; + $sql.=" group by extract(month from ts_created),extract(year from ts_created) + order by extract(year from ts_created),extract(month from ts_created)"; + $rs = $this->db->query($sql); + $rows = $rs->fetchAll(); + if(count($rows)<=0) + { + $this->view->newuser=""; + } + + $this->view->newuser = $rows; + + + + }//按月份统计 + + function awstatswebAction() + { + + }//awstats web 统计 + + function awstatsweb2Action() + { + + }//awstats web 统计 + + function awstatsftpAction() + { + + }//awstats ftp 统计 + + function awstatsftp2Action() + { + + }//awstats ftp 统计 + + function webalizerAction() + { + + }//webalizer 统计 + + function waterAction() + { + + $sql="select count(k.keyword) as num,d.status,k.keyword from dataorder d left join metadata m on d.uuid=m.uuid + left join keyword k on m.id=k.id + where (d.status=5 or d.status=-1) and m.source='0595169a-279e-4b95-819f-129d0ba4280d' + and (k.keyword='航空遥感' or k.keyword='卫星遥感' or k.keyword='气象水文' or k.keyword='上游寒区水文试验区' or k.keyword='森林水文试验区' or k.keyword='中游干旱区水文试验区') + group by k.keyword,d.status order by k.keyword desc,d.status desc"; + + $re =$this->db->query($sql); + $type =$re->fetchAll();//按分类 + + $this->view->type = $type; + + $sql="select count(extract(month from o.ts_created)) as c,extract(month from o.ts_created) as m,extract(year from o.ts_created) as y + from offlineapp o left join dataorder d on d.offlineappid=o.id left join metadata m on m.uuid=d.uuid + where m.source='0595169a-279e-4b95-819f-129d0ba4280d' and (d.status=3 or d.status=5 or d.status=-1) + group by extract(month from o.ts_created),extract(year from o.ts_created) + order by extract(year from o.ts_created),extract(month from o.ts_created)"; + + $re=$this->db->query($sql); + $month=$re->fetchAll(); + + $this->view->month = $month; + + $sql = "select + extract(year from o.ts_created) as y,extract(month from o.ts_created) as m, + count(extract(month from o.ts_created)) as c + from + (select distinct(o.id),o.ts_created + from offlineapp o where o.datalist like '%黑河综合遥感联合试验%') as o + group by extract(month from o.ts_created),extract(year from o.ts_created) + order by extract(year from o.ts_created),extract(month from o.ts_created)"; + + $re=$this->db->query($sql); + $order=$re->fetchAll(); + + $this->view->order = $order; + + $sql = "select (sum(m.filesize)/1024) as n from dataorder d left join metadata m on d.uuid=m.uuid + where d.status=5 and m.source='0595169a-279e-4b95-819f-129d0ba4280d'"; + + $re=$this->db->query($sql); + $num=$re->fetchAll(); + + $this->view->num=$num; + + + $sql = "select count(lower(o.unit)) as c,lower(o.unit) as u + from offlineapp o left join dataorder d on d.offlineappid=o.id left join metadata m on m.uuid=d.uuid + where m.source='0595169a-279e-4b95-819f-129d0ba4280d' and (d.status=5) + group by lower(o.unit) + order by lower(o.unit)"; + + $re=$this->db->query($sql); + $units=$re->fetchAll(); + + $this->view->units=$units; + + + $sql = "select count(t.unit) as c,t.unit from + (select distinct(o.id),o.unit + from offlineapp o left join dataorder d on d.offlineappid=o.id left join metadata m on m.uuid=d.uuid + where m.source='0595169a-279e-4b95-819f-129d0ba4280d' and (d.status=5) + ) as t + group by t.unit"; + + $re = $this->db->query($sql); + $ounit= $re->fetchAll(); + + $this->view->ounit = $ounit; + + //water 项目按月统计下载量 + $sql = "select (sum(m.filesize)/1024) as n,extract(month from d.ts_created) as m,extract(year from d.ts_created) as y from dataorder d left join metadata m on d.uuid=m.uuid + where d.status=5 and m.source='0595169a-279e-4b95-819f-129d0ba4280d' + group by extract(month from d.ts_created),extract(year from d.ts_created) + order by extract(year from d.ts_created),extract(month from d.ts_created)"; + + $re = $this->db->query($sql); + $dm = $re->fetchAll(); + + $this->view->dm = $dm; + + + }//WATER项目 + + public function jsonexit($data){ + $this->getResponse()->setHeader('Content-Type', 'application/json')->appendBody(json_encode($data,JSON_NUMERIC_CHECK)); + return true; + }//jsonexit() 退出并返回json数据 + +} + diff --git a/application/admin/controllers/SysController.php b/application/admin/controllers/SysController.php index b1faf9bc..f3ae2804 100644 --- a/application/admin/controllers/SysController.php +++ b/application/admin/controllers/SysController.php @@ -1,4 +1,6 @@ db->query($sql); + view::Post($this,'模板已删除',-1); + return; + + } + else if($ac=='test'&& !empty($id)) { if(!empty($submit)) @@ -424,10 +435,10 @@ class Admin_SysController extends Zend_Controller_Action if ($ac=='' || $ac=='online') { $sql = "SELECT m.title,m.uuid,ds.host,ds.path, - floor(t.filesize/1024/1024*100)/100 as filesize, - t.filecount from metadata m + floor(t.filesize/1024/1024*100)/100 as filesize, + t.filecount from metadata m LEFT JOIN mdstatus s ON m.uuid=s.uuid - LEFT JOIN dataset ds ON m.uuid=ds.uuid + LEFT JOIN dataset ds ON m.uuid=ds.uuid left join (select dsid,count(id) as filecount,sum(filesize) as filesize from datafile group by dsid) as t on ds.id=t.dsid where s.status>4 and m.datatype=0 and ds.host='ftp1.westgis.ac.cn' ORDER BY m.id DESC"; @@ -440,15 +451,15 @@ class Admin_SysController extends Zend_Controller_Action $paginator->setItemCountPerPage($pages); $paginator->setView($this->view); Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination.phtml'); - $this->view->paginator=$paginator; + $this->view->paginator=$paginator; $ac='online'; } else if ($ac=='heihe') { $sql = "SELECT m.title,m.uuid,ds.host,ds.path, - floor(t.filesize/1024/1024*100)/100 as filesize, - t.filecount from metadata m + floor(t.filesize/1024/1024*100)/100 as filesize, + t.filecount from metadata m LEFT JOIN mdstatus s ON m.uuid=s.uuid - LEFT JOIN dataset ds ON m.uuid=ds.uuid + LEFT JOIN dataset ds ON m.uuid=ds.uuid left join (select dsid,count(id) as filecount,sum(filesize) as filesize from datafile group by dsid) as t on ds.id=t.dsid left join datasource on datasource.uuid=m.uuid left join source on datasource.sourceid=source.id @@ -466,15 +477,15 @@ class Admin_SysController extends Zend_Controller_Action $this->view->paginator=$paginator; } else if ($ac=='water') { - $sql = "SELECT m.title,m.uuid,ds.host,ds.path, - floor(t.filesize/1024/1024*100)/100 as filesize, - t.filecount from metadata m - LEFT JOIN mdstatus s ON m.uuid=s.uuid - LEFT JOIN dataset ds ON m.uuid=ds.uuid - left join (select dsid,count(id) as filecount,sum(filesize) as filesize from datafile group by dsid) as t on ds.id=t.dsid - left join datasource on datasource.uuid=m.uuid - left join source on datasource.sourceid=source.id - where s.status>4 and m.datatype=1 and ds.host='ftp1.westgis.ac.cn' and source.code='water' + $sql = "SELECT m.title,m.uuid,ds.host,ds.path, + floor(t.filesize/1024/1024*100)/100 as filesize, + t.filecount from metadata m + LEFT JOIN mdstatus s ON m.uuid=s.uuid + LEFT JOIN dataset ds ON m.uuid=ds.uuid + left join (select dsid,count(id) as filecount,sum(filesize) as filesize from datafile group by dsid) as t on ds.id=t.dsid + left join datasource on datasource.uuid=m.uuid + left join source on datasource.sourceid=source.id + where s.status>4 and m.datatype=1 and ds.host='ftp1.westgis.ac.cn' and source.code='water' ORDER BY m.title DESC"; $sth = $this->db->prepare($sql); $sth->execute(); @@ -489,7 +500,7 @@ class Admin_SysController extends Zend_Controller_Action } else if ($ac=='heihe1') { $sql = "SELECT m.title,m.uuid,ds.host,ds.path, - floor(t.filesize/1024/1024*100)/100 as filesize, + floor(t.filesize/1024/1024*100)/100 as filesize, t.filecount from metadata m LEFT JOIN mdstatus s ON m.uuid=s.uuid LEFT JOIN dataset ds ON m.uuid=ds.uuid @@ -511,11 +522,11 @@ class Admin_SysController extends Zend_Controller_Action } else if ($ac=='hiwater') { $sql = "SELECT m.title,m.uuid,ds.host,ds.path, - floor(t.filesize/1024/1024*100)/100 as filesize, + floor(t.filesize/1024/1024*100)/100 as filesize, t.filecount from metadata m LEFT JOIN mdstatus s ON m.uuid=s.uuid LEFT JOIN dataset ds ON m.uuid=ds.uuid - left join (select dsid,count(id) as filecount,sum(filesize) as filesize from datafile group by dsid) as t on ds.id=t.dsid + left join (select dsid,count(id) as filecount,sum(filesize) as filesize from datafile group by dsid) as t on ds.id=t.dsid left join datasource on datasource.uuid=m.uuid left join source on datasource.sourceid=source.id where ds.host='ftp1.westgis.ac.cn' and source.code='hiwater' @@ -533,10 +544,10 @@ class Admin_SysController extends Zend_Controller_Action }else if ($ac=='westee') { $sql = "SELECT m.title,m.uuid,ds.host,ds.path, - floor(t.filesize/1024/1024*100)/100 as filesize, + floor(t.filesize/1024/1024*100)/100 as filesize, t.filecount from metadata m LEFT JOIN mdstatus s ON m.uuid=s.uuid - LEFT JOIN dataset ds ON m.uuid=ds.uuid + LEFT JOIN dataset ds ON m.uuid=ds.uuid left join (select dsid,count(id) as filecount,sum(filesize) as filesize from datafile group by dsid) as t on ds.id=t.dsid where ds.host='ftp1.westgis.ac.cn' and m.uuid in (select uuid from westeemd) ORDER BY m.title DESC"; @@ -553,10 +564,10 @@ class Admin_SysController extends Zend_Controller_Action }else if ($ac=='other') { $sql = "SELECT m.title,m.uuid,ds.host,ds.path, - floor(t.filesize/1024/1024*100)/100 as filesize, + floor(t.filesize/1024/1024*100)/100 as filesize, t.filecount from metadata m LEFT JOIN mdstatus s ON m.uuid=s.uuid - LEFT JOIN dataset ds ON m.uuid=ds.uuid + LEFT JOIN dataset ds ON m.uuid=ds.uuid left join (select dsid,count(id) as filecount,sum(filesize) as filesize from datafile group by dsid) as t on ds.id=t.dsid where ds.host='ftp1.westgis.ac.cn' and m.uuid not in (select uuid from datasource) and m.uuid not in (select uuid from westeemd) ORDER BY m.title DESC"; @@ -573,7 +584,7 @@ class Admin_SysController extends Zend_Controller_Action } $this->view->activeID="btn-".$ac; } - + function problemAction() { $pages=20; @@ -581,7 +592,7 @@ class Admin_SysController extends Zend_Controller_Action if ($ac=='' || $ac=='ref') { $sql = "SELECT m.title,m.uuid,m.citation,g.id as gid from metadata m - LEFT JOIN mdstatus s ON m.uuid=s.uuid + LEFT JOIN mdstatus s ON m.uuid=s.uuid left join geonetworkmetadata g on g.uuid=m.uuid where s.status>4 and m.citation like '%??%' ORDER BY m.id DESC"; @@ -594,16 +605,16 @@ class Admin_SysController extends Zend_Controller_Action $paginator->setItemCountPerPage($pages); $paginator->setView($this->view); Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination.phtml'); - $this->view->paginator=$paginator; - $this->_helper->viewRenderer('problem-ref'); + $this->view->paginator=$paginator; + $this->_helper->viewRenderer('problem-ref'); $ac='ref'; } else if ($ac=='file') { - $sql = "SELECT m.title,m.uuid,m.filesize,ds.host,ds.path from metadata m - LEFT JOIN mdstatus s ON m.uuid=s.uuid - LEFT JOIN dataset ds ON m.uuid=ds.uuid - where s.status>4 and ds.id not in (select distinct dsid from datafile) - group by m.title,m.uuid,ds.host,ds.path,m.filesize + $sql = "SELECT m.title,m.uuid,m.filesize,ds.host,ds.path from metadata m + LEFT JOIN mdstatus s ON m.uuid=s.uuid + LEFT JOIN dataset ds ON m.uuid=ds.uuid + where s.status>4 and ds.id not in (select distinct dsid from datafile) + group by m.title,m.uuid,ds.host,ds.path,m.filesize ORDER BY m.title DESC;"; $sth = $this->db->prepare($sql); $sth->execute(); @@ -617,18 +628,18 @@ class Admin_SysController extends Zend_Controller_Action $this->view->paginator=$paginator; } else if ($ac=='tiny') { - $sql = "SELECT m.title,m.uuid,ds.host,ds.path, - floor(sum(datafile.filesize)/1024/1024*100)/100 as filesize, - count(datafile.id) as filecount - from metadata m - LEFT JOIN mdstatus s ON m.uuid=s.uuid - LEFT JOIN dataset ds ON m.uuid=ds.uuid - left join datasource on datasource.uuid=m.uuid - left join datafile on ds.id=datafile.dsid - left join source on datasource.sourceid=source.id - where s.status>4 and ds.id in (select t.dsid from (select dsid,count(id) as filecount,sum(filesize) as filesize from datafile group by dsid) as t -where t.filesize<1024*5) - group by m.title,m.uuid,ds.host,ds.path + $sql = "SELECT m.title,m.uuid,ds.host,ds.path, + floor(sum(datafile.filesize)/1024/1024*100)/100 as filesize, + count(datafile.id) as filecount + from metadata m + LEFT JOIN mdstatus s ON m.uuid=s.uuid + LEFT JOIN dataset ds ON m.uuid=ds.uuid + left join datasource on datasource.uuid=m.uuid + left join datafile on ds.id=datafile.dsid + left join source on datasource.sourceid=source.id + where s.status>4 and ds.id in (select t.dsid from (select dsid,count(id) as filecount,sum(filesize) as filesize from datafile group by dsid) as t +where t.filesize<1024*5) + group by m.title,m.uuid,ds.host,ds.path ORDER BY m.title DESC;"; $sth = $this->db->prepare($sql); $sth->execute(); @@ -642,14 +653,14 @@ where t.filesize<1024*5) $this->view->paginator=$paginator; } else if ($ac=='heihefund') { - $sql = "SELECT m.title,m.uuid,g.id as gid - from metadata m - LEFT JOIN mdstatus s ON m.uuid=s.uuid - left join datasource on datasource.uuid=m.uuid - left join source on datasource.sourceid=source.id -left join mdfund mf on mf.uuid=m.uuid -left join geonetworkmetadata g on m.uuid=g.uuid - where s.status>4 and source.code='heihe' and mf.fid is null + $sql = "SELECT m.title,m.uuid,g.id as gid + from metadata m + LEFT JOIN mdstatus s ON m.uuid=s.uuid + left join datasource on datasource.uuid=m.uuid + left join source on datasource.sourceid=source.id +left join mdfund mf on mf.uuid=m.uuid +left join geonetworkmetadata g on m.uuid=g.uuid + where s.status>4 and source.code='heihe' and mf.fid is null ORDER BY m.title DESC;"; $sth = $this->db->prepare($sql); $sth->execute(); @@ -660,19 +671,19 @@ left join geonetworkmetadata g on m.uuid=g.uuid $paginator->setItemCountPerPage($pages); $paginator->setView($this->view); Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination.phtml'); - $this->view->paginator=$paginator; + $this->view->paginator=$paginator; $this->_helper->viewRenderer('problem-md'); } else if ($ac=='noemail') { - $sql = "SELECT distinct m.title,m.uuid,g.id as gid - from metadata m - LEFT JOIN mdstatus s ON m.uuid=s.uuid -left join role on role.uuid=m.uuid -left join geonetworkmetadata g on m.uuid=g.uuid - where m.datatype=1 and s.status>4 and m.uuid not in ( -select role.uuid from role left join responsible res on role.resid=res.id -where res.email is not null and role.role in ('resourceProvider','owner','pointOfContact','custodian') -) + $sql = "SELECT distinct m.title,m.uuid,g.id as gid + from metadata m + LEFT JOIN mdstatus s ON m.uuid=s.uuid +left join role on role.uuid=m.uuid +left join geonetworkmetadata g on m.uuid=g.uuid + where m.datatype=1 and s.status>4 and m.uuid not in ( +select role.uuid from role left join responsible res on role.resid=res.id +where res.email is not null and role.role in ('resourceProvider','owner','pointOfContact','custodian') +) ORDER BY m.title DESC;"; $sth = $this->db->prepare($sql); $sth->execute(); @@ -683,16 +694,16 @@ where res.email is not null and role.role in ('resourceProvider','owner','pointO $paginator->setItemCountPerPage($pages); $paginator->setView($this->view); Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination.phtml'); - $this->view->paginator=$paginator; + $this->view->paginator=$paginator; $this->_helper->viewRenderer('problem-md'); } else if ($ac=='unmoved') { - $sql = "SELECT distinct m.title,m.uuid,g.id as gid - from metadata m -LEFT JOIN mdstatus s ON m.uuid=s.uuid -left join geonetworkmetadata g on m.uuid=g.uuid -left join dataset ds on ds.uuid=m.uuid - where s.status>4 and ds.path like '%upload%' + $sql = "SELECT distinct m.title,m.uuid,g.id as gid + from metadata m +LEFT JOIN mdstatus s ON m.uuid=s.uuid +left join geonetworkmetadata g on m.uuid=g.uuid +left join dataset ds on ds.uuid=m.uuid + where s.status>4 and ds.path like '%upload%' ORDER BY m.title DESC;"; $sth = $this->db->prepare($sql); $sth->execute(); @@ -703,7 +714,7 @@ left join dataset ds on ds.uuid=m.uuid $paginator->setItemCountPerPage($pages); $paginator->setView($this->view); Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination.phtml'); - $this->view->paginator=$paginator; + $this->view->paginator=$paginator; $this->_helper->viewRenderer('problem-md'); } $this->view->activeID="btn-".$ac; diff --git a/application/admin/controllers/UserController.php b/application/admin/controllers/UserController.php index f5d44c7c..61593c99 100755 --- a/application/admin/controllers/UserController.php +++ b/application/admin/controllers/UserController.php @@ -2,7 +2,6 @@ use Helpers\View as view; use \Users\Local; use Helpers\dbh; - class Admin_UserController extends Zend_Controller_Action { function preDispatch() @@ -157,12 +156,46 @@ class Admin_UserController extends Zend_Controller_Action $select->from('users') ->where('usertype = ?', 'administrator') ->order('users.id desc'); + + $paginator = Zend_Paginator::factory($select); $paginator->setCurrentPageNumber($this->_getParam('page')); $paginator->setItemCountPerPage(30); $paginator->setView($this->view); Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination.phtml'); $this->view->paginator=$paginator; + + $ac = $this->_getParam('ac'); + + if($ac == 'sync') + { + $sql = "SELECT id FROM users WHERE usertype='administrator'"; + $rs = $this->db->query($sql); + $ids = $rs->fetchAll(); + + $data = array(); + foreach($ids as $v) + { + $data[] = $v['id']; + } + unset($ids); + + $ids = join(",",$data); + + $gn_sql = "update users set profile='Administrator' where id in ($ids)"; + $gn_db = new PDO(array( + 'host'=> $this->view->config->geonetwork->params->host, + 'port' => 5432, + 'user' => $this->view->config->geonetwork->params->username, + 'pwd' => $this->view->config->geonetwork->params->password , + 'db' => $this->view->config->geonetwork->params->dbname + )); + + $gn_db->exec("update users set profile='Editor' where id>1 and profile='Administrator'"); + $gn_db->exec($gn_sql); + + view::Post($this,"同步成功!",-1); + } } function showAction() diff --git a/application/admin/views/scripts/data/attachmentsadd.phtml b/application/admin/views/scripts/data/attachmentsadd.phtml index c6a37c0a..3c7c33f4 100644 --- a/application/admin/views/scripts/data/attachmentsadd.phtml +++ b/application/admin/views/scripts/data/attachmentsadd.phtml @@ -7,12 +7,7 @@ $this->breadcrumb('后台首页'); $this->breadcrumb('数据管理'); $this->breadcrumb()->setSeparator(' > '); - $this->headLink()->appendStylesheet('/static/js/uploadify/uploadify.css'); - $this->headScript()->appendFile('/static/js/jquery-1.7.2.min.js'); - $this->headScript()->appendFile('/js/jquery.colorbox-min.js'); - $this->headLink()->appendStylesheet('/css/colorbox.css'); - $this->headScript()->appendFile('/static/js/uploadify/swfobject.js'); - $this->headScript()->appendFile('/static/js/uploadify/jquery.uploadify.v2.1.4.min.js'); + $this->theme->AppendPlus($this,"uploadify"); ?>
partial('data/left.phtml'); ?> @@ -21,7 +16,7 @@
返回元数据附件列表 -查看元数据 +查看元数据 返回附件管理
@@ -30,73 +25,87 @@

注:可选择多个文件
-

+
+
-

diff --git a/application/admin/views/scripts/data/visual.phtml b/application/admin/views/scripts/data/visual.phtml new file mode 100644 index 00000000..ad30c23d --- /dev/null +++ b/application/admin/views/scripts/data/visual.phtml @@ -0,0 +1,20 @@ +headTitle($this->config->title->site); + $this->headTitle('后台管理'); + $this->headTitle()->setSeparator(' - '); + $this->headLink()->appendStylesheet('/css/admin.css'); + $this->breadcrumb('首页'); + $this->breadcrumb('后台首页'); + $this->breadcrumb('数据管理'); + $this->breadcrumb('同步GEONETWORK元数据'); + $this->breadcrumb()->setSeparator(' > '); +?> +
+
+ partial('data/left.phtml'); ?> +
+ +
+ +
+
diff --git a/application/admin/views/scripts/down/left.phtml b/application/admin/views/scripts/down/left.phtml index 5afd002e..292331de 100644 --- a/application/admin/views/scripts/down/left.phtml +++ b/application/admin/views/scripts/down/left.phtml @@ -1,10 +1,8 @@ - + '地点关键词','theme'=>'主题关键词','discipline'=>'学科关键词','stratum'=>'地层关键词','temporal'=>'时间关键词'); + $keytypezh=array('place'=>'地点关键词','theme'=>'主题关键词','discipline'=>'学科关键词','stratum'=>'地层关键词','temporal'=>'时间关键词'); $type='theme'; -?> -
-

+?> +
+

-
+
-
-

+
+

-
-
-
+
+ +
-
-

+?> +
+

    keywords[$type] as $cg) : ?>
  • '>()
-
+
-
-

+
+

    keywords[$type] as $cg) : ?>
  • '>()
-
+
@@ -94,7 +94,7 @@ $this->headTitle()->setSeparator(' - ');
  • '>()
  • -
    +

     数据服务

    @@ -102,6 +102,7 @@ $this->headTitle()->setSeparator(' - ');
  • -   离线数据服务记录(最近20个)
  • -   如何从数据中心申请数据
  • -   如何在数据中心发布数据
  • +
  • -   数据可视化
  • diff --git a/application/default/views/scripts/data/view.phtml b/application/default/views/scripts/data/view.phtml index b193aa7d..ee20e461 100755 --- a/application/default/views/scripts/data/view.phtml +++ b/application/default/views/scripts/data/view.phtml @@ -19,6 +19,7 @@ h3.gs_rt{font-size:110%;} #file-list li li:hover {background-color: #dedede;} #file-list li li li:hover {background-color: #eeeeee;} +render('breadcrumbs.phtml'); ?> metadata;if ($md):?>

    escape($md->title); if ($md->title_en) echo '
    '.$this->escape($md->title_en);?> @@ -32,7 +33,26 @@ if ($md->title_en) echo '
    '.$this->escape($md->title_en);?>

    ',$md->description);?>

    -
    +
    + mcitation) : ?> +
    +

    本数据要求的多篇文献引用

    +
      + mcitation as $ref) : + echo '
    1. '.$ref->reference; + echo '查看'; + if (empty($ref->link)) + { + if(!empty($ref->attid)) + echo '下载'; + }else{ + echo '下载'; + } + echo "
    2. "; + endforeach; + ?> +
    + citation) : ?>

    本数据引用方式数据引用帮助

    @@ -46,29 +66,63 @@ if ($md->title_en) echo '
    '.$this->escape($md->title_en);?> echo substr($md->authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. doi:'.$md->doi; echo ' ['.str_replace('"','',substr($md->author_en,1,-1)).'. '.$md->title_en.'. '.$md->publisher_en.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. doi:'.$md->doi.']'; ?> (下载引用:RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式)

    - ref) : ?> + ref) : ?>
    -

    建议参考文献

    +

    相关文献(作者推荐)

      ref as $ref) : + echo '
    1. '.$ref->reference; + echo '查看'; if (empty($ref->link)) - echo '
    2. '.$ref->reference.'
    3. '; - else - echo '
    4. '.$ref->reference.' 下载
    5. '; + { + if(!empty($ref->attid)) + echo '下载'; + }else{ + echo '下载'; + } + echo ""; endforeach; ?>
    - - userref) : ?> + themeref) :?> +
    -

    数据用户发表文献

    +

    专题文献

    +
      + themeref as $ref) : + echo '
    1. '.$ref->reference; + echo '查看'; + if (empty($ref->link)) + { + if(!empty($ref->attid)) + echo ' | 下载'; + }else{ + echo ' | 下载'; + } + echo "
    2. "; + endforeach; + ?> +
    + userref) : ?> +
    +

    数据施引文献

      userref as $ref) : + echo '
    1. '.$ref->reference; + echo '查看'; if (empty($ref->link)) - echo '
    2. '.$ref->reference.'
    3. '; - else - echo '
    4. '.$ref->reference.' 下载
    5. '; + { + if(!empty($ref->attid)) + echo '下载'; + }else{ + echo '下载'; + } + echo ""; endforeach; + if (count($this->userref)==15) + { + echo '更多施引文献'; + } ?>
    @@ -101,7 +155,7 @@ if ($md->title_en) echo '
    '.$this->escape($md->title_en);?> fund)) : ?> suppinfo)) : ?> diff --git a/application/default/views/scripts/glacier/base.phtml b/application/default/views/scripts/glacier/base.phtml new file mode 100644 index 00000000..23caa2c3 --- /dev/null +++ b/application/default/views/scripts/glacier/base.phtml @@ -0,0 +1,30 @@ +headTitle($this->config->title->site); +$this->headTitle($this->config->title->data); +$this->headTitle()->setSeparator(' - '); +$this->headLink()->appendStylesheet('/css/water.css'); +$this->nav[] = array('link'=>"/glacier",'title'=>$this->config->title->glacier); +?> +render('breadcrumbs.phtml'); ?> +
    +
    + partial('glacier/navi.phtml'); ?> +
    +
    + info) : ?> +
    + info['body'])) echo $this->info['body'];?> +
    + + metadata) : ?> + page->getNavigation(); ?> +
    +
      + metadata as $md) : ?> +
    1. + +
    +
    + +
    +
    \ No newline at end of file diff --git a/application/default/views/scripts/glacier/browse.phtml b/application/default/views/scripts/glacier/browse.phtml index 1825019c..3d2cb3b8 100755 --- a/application/default/views/scripts/glacier/browse.phtml +++ b/application/default/views/scripts/glacier/browse.phtml @@ -11,10 +11,10 @@ $this->breadcrumb('浏览'); $this->breadcrumb()->setSeparator(' > '); ?>
    -
    +
    partial('glacier/navi.phtml'); ?>
    -
    +
    page->getNavigation(); ?>
    diff --git a/application/default/views/scripts/glacier/category.phtml b/application/default/views/scripts/glacier/category.phtml deleted file mode 100755 index e30bde12..00000000 --- a/application/default/views/scripts/glacier/category.phtml +++ /dev/null @@ -1,43 +0,0 @@ -headTitle($this->config->title->site); - $this->headTitle($this->config->title->data); -$this->headTitle('分类浏览'); -if (!empty($this->codename)) $this->headTitle($this->codename); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('分类浏览:'.$this->codename); -$this->breadcrumb()->setSeparator(' > '); -?> -
    -
    - partial('glacier/navi.phtml'); ?> -
    -
    - - - metadata)) : ?> -
    - page->getNavigation(); ?> -
    -
    -
      - metadata as $md) : ?> -
    1. - -
    -
    -
    - page->getNavigation(); ?> -
    - -
    -
    \ No newline at end of file diff --git a/application/default/views/scripts/glacier/everestnorth.phtml b/application/default/views/scripts/glacier/everestnorth.phtml deleted file mode 100644 index 1d531234..00000000 --- a/application/default/views/scripts/glacier/everestnorth.phtml +++ /dev/null @@ -1,33 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('珠穆朗玛峰北坡'); -$this->breadcrumb()->setSeparator(' > '); -?> - - - diff --git a/application/default/views/scripts/glacier/field.phtml b/application/default/views/scripts/glacier/field.phtml deleted file mode 100644 index 1f18f4de..00000000 --- a/application/default/views/scripts/glacier/field.phtml +++ /dev/null @@ -1,33 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('冰湖编目数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
    -
    - partial('glacier/navi.phtml'); ?> -
    -
    -
    -

    为了对冰川编目结果进行验证并获得更多的冰川环境信息,项目开展了大量的野外考察。考察范围包括:祁连山、昆仑山-唐古拉山、喜马拉雅山、青藏高原腹地冰川考察、黄河源-念青唐古拉山中段北坡-喜马拉雅山中段。考察内容包括GPS测量、冰川厚度测量、冰川区地形摄影测量、冰川物质平衡测量、冰川区气象水文要素测量、冰湖水位和温度测量等。

    - -
    -
    - metadata) : ?> - page->getNavigation(); ?> -
    -
      - metadata as $md) : ?> -
    1. - -
    -
    - -
    -
    \ No newline at end of file diff --git a/application/default/views/scripts/glacier/frozensoil.phtml b/application/default/views/scripts/glacier/frozensoil.phtml deleted file mode 100644 index 8a984fea..00000000 --- a/application/default/views/scripts/glacier/frozensoil.phtml +++ /dev/null @@ -1,33 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('冻土数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
    -
    - partial('glacier/navi.phtml'); ?> -
    -
    -
    -

    与多年冻土相关的测量数据,包括探地雷达测量的地下冰厚度、冻土层上限等。 -

    -
    -
    - metadata) : ?> - page->getNavigation(); ?> -
    -
      - metadata as $md) : ?> -
    1. - -
    -
    - -
    -
    \ No newline at end of file diff --git a/application/default/views/scripts/glacier/geobase.phtml b/application/default/views/scripts/glacier/geobase.phtml deleted file mode 100644 index 72369e3f..00000000 --- a/application/default/views/scripts/glacier/geobase.phtml +++ /dev/null @@ -1,34 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('基础数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
    -
    - partial('glacier/navi.phtml'); ?> -
    -
    -
    -

    基础数据是指用于开展冰川和冰湖编目的遥感影像、地形图和数字地形模型,由于地形图属国家保密数据,不在共享范围内。

    -

    地形图主要用来地第一次冰川编目数据进行校正,并辅助第二次冰川编目中冰川边界和山脊线的判断。冰川编目中使用和参考的地形图约1105幅,其中1:50,000地形图546幅(航摄制图512幅,陆地摄影测量成果15幅,平板仪测绘及其他地图19幅),1:100,000地形图572幅(航摄制图558幅,平板仪测绘及其他地图14幅),另外还参考了1975年左右的MSS遥感数据地形图7幅。

    - -
    -
    - metadata) : ?> - page->getNavigation(); ?> -
    -
      - metadata as $md) : ?> -
    1. - -
    -
    - -
    -
    \ No newline at end of file diff --git a/application/default/views/scripts/glacier/glacier.phtml b/application/default/views/scripts/glacier/glacier.phtml deleted file mode 100644 index b4c70c2c..00000000 --- a/application/default/views/scripts/glacier/glacier.phtml +++ /dev/null @@ -1,33 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('冰川编目数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
    -
    - partial('glacier/navi.phtml'); ?> -
    -
    -
    -

    冰川编目数据:基于遥感影像解译获得的反应我国2005年前后冰川现状的冰川分布图及其基本属性。除了包括中国全境的冰川编目数据外,还包括祁连山、天山、贡嘎山、纳木错流域、长江源区、年楚河流域和珠穆朗玛峰北坡等典型地区的多年代冰川分布数据。 -

    -
    -
    - metadata) : ?> - page->getNavigation(); ?> -
    -
      - metadata as $md) : ?> -
    1. - -
    -
    - -
    -
    \ No newline at end of file diff --git a/application/default/views/scripts/glacier/gongga.phtml b/application/default/views/scripts/glacier/gongga.phtml deleted file mode 100644 index 91f1585c..00000000 --- a/application/default/views/scripts/glacier/gongga.phtml +++ /dev/null @@ -1,33 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('贡嘎山'); -$this->breadcrumb()->setSeparator(' > '); -?> - - - diff --git a/application/default/views/scripts/glacier/gps.phtml b/application/default/views/scripts/glacier/gps.phtml deleted file mode 100644 index 9f86e3f2..00000000 --- a/application/default/views/scripts/glacier/gps.phtml +++ /dev/null @@ -1,33 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('GPS测量数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
    -
    - partial('glacier/navi.phtml'); ?> -
    -
    -
    -

    采用高精度GPS设备在冰川表面或周边地区测量获得的数据,可用来获得冰川高程信息,也可与以前的观测数据相比较获得冰川流动和物质平衡变化信息。

    - -
    -
    - metadata) : ?> - page->getNavigation(); ?> -
    -
      - metadata as $md) : ?> -
    1. - -
    -
    - -
    -
    \ No newline at end of file diff --git a/application/default/views/scripts/glacier/hydro.phtml b/application/default/views/scripts/glacier/hydro.phtml deleted file mode 100644 index 8e50adcd..00000000 --- a/application/default/views/scripts/glacier/hydro.phtml +++ /dev/null @@ -1,33 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('水文数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
    -
    - partial('glacier/navi.phtml'); ?> -
    -
    -
    -

    在冰川下游观测获得的水文数据,观测要素包括径流、水质和水文化学等,也包括部分冰湖的观测数据。

    - -
    -
    - metadata) : ?> - page->getNavigation(); ?> -
    -
      - metadata as $md) : ?> -
    1. - -
    -
    - -
    -
    \ No newline at end of file diff --git a/application/default/views/scripts/glacier/index.phtml b/application/default/views/scripts/glacier/index.phtml index 0592ae59..f6fe0be2 100755 --- a/application/default/views/scripts/glacier/index.phtml +++ b/application/default/views/scripts/glacier/index.phtml @@ -3,73 +3,20 @@ $this->headTitle($this->config->title->site); $this->headTitle($this->config->title->data); $this->headTitle()->setSeparator(' - '); $this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb($this->config->title->glacier); -$this->breadcrumb()->setSeparator(' > '); +$this->nav[] = array('link'=>"/glacier",'title'=>$this->config->title->glacier); ?> +render('breadcrumbs.phtml'); ?>
    -
    - partial('glacier/navi.phtml'); ?> +
    + partial('glacier/navi.phtml'); ?>
    -
    + +
    -

    “中国冰川资源及其变化调查”项目简介

    -

    - 冰川是最敏感、最直接、最易于辩识、长纪录、高分辨的气候变化信息指示器和储存体,冰川变化信息是全球变化中的重要基础性资源。我国是中、低纬度山 地冰川面积最多的国家(占52%),是两极冰盖之外最重要的冰川集结地,冰川变化信息的挖掘、调查、监测、编目是十分重要的基础性工作。 -

    -

    - 始于1978年的第一次冰川编目历时24年,查清了截止到第一次全国航空测量时(西部冰川区约为1960s-1980s)中国冰川资源的基本情况。第一次冰川清查工作在国际和国内产生了重大影响,被国际冰川学会主席誉为建立了一座“冰川和气候变化研究的金矿”。 - 本次冰川资源调查是在中国科技部和中国科学院的联合支持下开展的一次大规模冰川普查,其目标以第一次冰川编目为参考,以2005-2006年为现状 年,以高分辨率遥感数据与地理信息系统技术为基础,深入研究基于遥感的冰川制图方法,结合冰川野外考察考察,获取我国冰川的分布状况,对有观测历史的典型 冰川进行重点监测;并与第一次冰川编目数据进行比较,查明我国冰川资源变化情况;同时,以此调查数据为基础,综合定位监测与相关资料,评估冰川变化对水资 源的影响,为西部水资源开发利用提供决策依据 。 -

    -

    《中国冰川资源及其变化调查》主要研究内容

    -
      -
    1. 第一次冰川编目的数字化:重点开展第一次冰川编目时期冰川及冰湖分布的数字化,为冰川遥感监测提供基础数据。
    2. -
    3. 现状年(2005-2006年)西北干旱区和其它典型区冰川(湖)分布遥感调查:重点开展现状年基于高分辨率遥感影像的冰川与冰湖分布调查,同时,开展研究区部分冰川表面高程和运动速度信息的提取。
    4. -
    5. 遥感冰川制图地面验证、典型冰川厚度测量与冰川变化野外调查:重点开展代表性区域野外调查和典型冰川定位观测,验证遥感解译结果,获取典型监测冰川过程观测数据;开展代表性冰川厚度的雷达测量。
    6. -
    7. 冰川变化对水资源的影响评估:以现有定位观测冰川和区域冰川变化遥感调查数据为基础,评估西北干旱区和其它典型区冰川变化特征及其对水资源的影响。
    8. -
    9. 冰川资源及其变化调查信息共享平台建设:建立冰川资源管理及共享信息系统,为资源共享服务。
    10. -
    -

    《西部冰川变化监测及其影响评估方法研究》主要研究内容

    -
      -
    1. 各类冰川参数的遥感提取方法研究:针对西部三类冰川特点,综合运用现有卫星遥感数据,建立冰川几何尺寸、特征要素、物理特征、表面高程等信息的提取算法,为大范围冰川调查提供适合各类冰川下垫面状况和气候条件的参数提取方法集,提高遥感获取冰川信息的自动化程度。
    2. -
    3. 冰川储量估算与冰川参数遥感提取精度评估:研制或改进冰川厚度测量雷达,对不同类型典型冰川流域不同规模的代表性冰川进行冰川厚度测量,建立适 合不同规模冰川的储量计算公式;开展各典型监测冰川区遥感冰川制图的野外验证、控制点采集与冰川变化的调查,进行遥感提取参数的误差分析与方法验证研究。
    4. -
    5. 流域冰川融水径流估算方法研究:以典型监测冰川长期观测资料为基础,并进行加强观测,同时收集流域出山口径流长期水文气象观测数据,建立适合不同资料条件的简单和复杂冰川融水径流模型,在对比分析基础上,提出适合西部流域尺度的冰川融水径流计算方案。
    6. -
    7. 冰川变化对水资源影响的评估方法及其应用研究:分析典型冰川流域冰川变化的空间特征及其差异;以典型冰川融水径流过程和流域尺度冰川动力响应研 究为基础,研究不同融水径流计算方案、基于冰川动力响应和基于冰川几何尺度转换关系模型对于不同性质冰川流域融水径流年际变化的模拟能力;根据流域融水径 流模型集,剖析冰川变化对冰川径流临界转变的影响及其强度。
    8. -
    +

    info['title'])) echo $this->info['title']; ?>

    + + +
    info['body'])) echo $this->info['body'];?>
    -
    - \ No newline at end of file diff --git a/application/default/views/scripts/glacier/inventory.phtml b/application/default/views/scripts/glacier/inventory.phtml deleted file mode 100644 index 96ad5eeb..00000000 --- a/application/default/views/scripts/glacier/inventory.phtml +++ /dev/null @@ -1,35 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('冰川冰湖编目数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
    -
    - partial('glacier/navi.phtml'); ?> -
    -
    -
    -

    冰川编目数据:基于遥感影像解译获得的反应我国2005年前后冰川现状的冰川分布图及其基本属性。除了包括中国全境的冰川编目数据外,还包括祁连山、天山、贡嘎山、纳木错流域、长江源区、年楚河流域和珠穆朗玛峰北坡等典型地区的多年代冰川分布数据。 -

    -

    冰湖编目数据: - 冰湖是指在冰川前端、表面或内部形成的湖泊。冰湖编目是指利用地形图和遥感数据等资料对位于冰川前端和表面的湖泊进行登记的调查行为。

    -
    -
    - metadata) : ?> - page->getNavigation(); ?> -
    -
      - metadata as $md) : ?> -
    1. - -
    -
    - -
    -
    \ No newline at end of file diff --git a/application/default/views/scripts/glacier/lake.phtml b/application/default/views/scripts/glacier/lake.phtml deleted file mode 100644 index 20156b61..00000000 --- a/application/default/views/scripts/glacier/lake.phtml +++ /dev/null @@ -1,34 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('冰湖编目数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
    -
    - partial('glacier/navi.phtml'); ?> -
    -
    -
    -

    冰湖编目数据: - 冰湖是指在冰川前端、表面或内部形成的湖泊。冰湖编目是指利用地形图和遥感数据等资料对位于冰川前端和表面的湖泊进行登记的调查行为。

    - -
    -
    - metadata) : ?> - page->getNavigation(); ?> -
    -
      - metadata as $md) : ?> -
    1. - -
    -
    - -
    -
    \ No newline at end of file diff --git a/application/default/views/scripts/glacier/lidar.phtml b/application/default/views/scripts/glacier/lidar.phtml deleted file mode 100644 index 4086d158..00000000 --- a/application/default/views/scripts/glacier/lidar.phtml +++ /dev/null @@ -1,35 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('雷达测厚数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
    -
    - partial('glacier/navi.phtml'); ?> -
    -
    -
    -

    - 利用冰川测厚雷达获得的反应冰川厚度和冰下地形的野外测量数据,可为冰川厚度分布图和冰下地形图等提供重要的基础资料。同时,利用这些测量资料可以估算冰川的冰储量,为冰川变化响应气候变化提供定量科学依据,而且可以为各种水文模型提供重要的冰下地形参数。 -

    - -
    -
    - metadata) : ?> - page->getNavigation(); ?> -
    -
      - metadata as $md) : ?> -
    1. - -
    -
    - -
    -
    \ No newline at end of file diff --git a/application/default/views/scripts/glacier/material.phtml b/application/default/views/scripts/glacier/material.phtml deleted file mode 100644 index 8b116cc2..00000000 --- a/application/default/views/scripts/glacier/material.phtml +++ /dev/null @@ -1,35 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('物质平衡观测数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
    -
    - partial('glacier/navi.phtml'); ?> -
    -
    -
    -

    - 冰川在一定时间内的物质变化即积累与消融之差。积累大于消融为正平衡,消融大于积累为负平衡。冰川物质平衡野外观测一般包括利用雪坑剖面观测冰川积累量和花杆观测冰川消融量。 -

    - -
    -
    - metadata) : ?> - page->getNavigation(); ?> -
    -
      - metadata as $md) : ?> -
    1. - -
    -
    - -
    -
    \ No newline at end of file diff --git a/application/default/views/scripts/glacier/meteo.phtml b/application/default/views/scripts/glacier/meteo.phtml deleted file mode 100644 index 9ff309a7..00000000 --- a/application/default/views/scripts/glacier/meteo.phtml +++ /dev/null @@ -1,33 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('气象数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
    -
    - partial('glacier/navi.phtml'); ?> -
    -
    -
    -

    在冰川区观测的气象数据,观测要素包括温度、风速、风向、降水等。受观测条件的限制,观测要素和观测时段不能保持完全一致。

    - -
    -
    - metadata) : ?> - page->getNavigation(); ?> -
    -
      - metadata as $md) : ?> -
    1. - -
    -
    - -
    -
    \ No newline at end of file diff --git a/application/default/views/scripts/glacier/movement.phtml b/application/default/views/scripts/glacier/movement.phtml deleted file mode 100644 index 4425b6bf..00000000 --- a/application/default/views/scripts/glacier/movement.phtml +++ /dev/null @@ -1,33 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('冰川运动数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
    -
    - partial('glacier/navi.phtml'); ?> -
    -
    -
    -

    冰川运动观测一般分为冰川表面运动观测和冰川内部运动观测。前者一般采用GPS和花杆等测量方法,后者一般采用挖坑法、冰隧道法和钻孔法。 -

    -
    -
    - metadata) : ?> - page->getNavigation(); ?> -
    -
      - metadata as $md) : ?> -
    1. - -
    -
    - -
    -
    \ No newline at end of file diff --git a/application/default/views/scripts/glacier/namco.phtml b/application/default/views/scripts/glacier/namco.phtml deleted file mode 100644 index b9c72707..00000000 --- a/application/default/views/scripts/glacier/namco.phtml +++ /dev/null @@ -1,33 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('纳木错流域'); -$this->breadcrumb()->setSeparator(' > '); -?> - - - diff --git a/application/default/views/scripts/glacier/navi.phtml b/application/default/views/scripts/glacier/navi.phtml index d0a577ee..24d80aeb 100644 --- a/application/default/views/scripts/glacier/navi.phtml +++ b/application/default/views/scripts/glacier/navi.phtml @@ -70,13 +70,6 @@
    -
    - \ No newline at end of file diff --git a/application/default/views/scripts/glacier/tianshan.phtml b/application/default/views/scripts/glacier/tianshan.phtml deleted file mode 100644 index 51b4b6f6..00000000 --- a/application/default/views/scripts/glacier/tianshan.phtml +++ /dev/null @@ -1,33 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('天山'); -$this->breadcrumb()->setSeparator(' > '); -?> - - - diff --git a/application/default/views/scripts/glacier/timeline.phtml b/application/default/views/scripts/glacier/timeline.phtml index aca2c805..89c7b4e8 100755 --- a/application/default/views/scripts/glacier/timeline.phtml +++ b/application/default/views/scripts/glacier/timeline.phtml @@ -12,12 +12,14 @@ $this->breadcrumb()->setSeparator(' > '); $this->headScript()->appendFile('/js/timeline_var.js'); $this->headScript()->appendFile('/js/timeline_js/timeline-api.js'); $this->headScript()->appendFile('/js/glaciertime.js'); +$this->nav[] = array('link'=>"/glacier/",'title'=>$this->config->title->glacier); +$this->nav[] = array('link'=>"/glacier/timeline",'title'=>'时间轴导航'); ?>
    -
    +
    partial('glacier/navi.phtml'); ?>
    -
    +
    \ No newline at end of file diff --git a/application/default/views/scripts/glacier/timemap.phtml b/application/default/views/scripts/glacier/timemap.phtml index 77c6ff2c..71a0e216 100644 --- a/application/default/views/scripts/glacier/timemap.phtml +++ b/application/default/views/scripts/glacier/timemap.phtml @@ -14,16 +14,18 @@ $this->theme->AppendPlus($this,'colorbox'); $this->headScript()->appendFile('/js/timeline_var.js'); $this->headScript()->appendFile('/js/timeline_js/timeline-api.js'); $this->headScript()->appendFile('/js/timemap.2.0.1/lib/mxn/mxn.js?(googlev3)'); -$this->headScript()->appendFile('/js/timemap.2.0.1/timemap.pack.js'); +$this->headScript()->appendFile('/js/timemap.2.0.1/timemap.pack.js'); +$this->nav[] = array('link'=>"/glacier/",'title'=>$this->config->title->glacier); +$this->nav[] = array('link'=>"/glaicer/timemap",'title'=>'时空导航'); ?>
    -
    +
    partial('glacier/navi.phtml'); ?>
    -
    +
    breadcrumb() ?>
    diff --git a/application/default/views/scripts/glacier/vegetation.phtml b/application/default/views/scripts/glacier/vegetation.phtml deleted file mode 100644 index 3f2258e0..00000000 --- a/application/default/views/scripts/glacier/vegetation.phtml +++ /dev/null @@ -1,33 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('植被数据'); -$this->breadcrumb()->setSeparator(' > '); -?> -
    -
    - partial('glacier/navi.phtml'); ?> -
    -
    -
    -

    冰川区附近的植被分布情况调查 -

    -
    -
    - metadata) : ?> - page->getNavigation(); ?> -
    -
      - metadata as $md) : ?> -
    1. - -
    -
    - -
    -
    \ No newline at end of file diff --git a/application/default/views/scripts/glacier/view.phtml b/application/default/views/scripts/glacier/view.phtml index fc17c688..34d9053a 100755 --- a/application/default/views/scripts/glacier/view.phtml +++ b/application/default/views/scripts/glacier/view.phtml @@ -4,32 +4,34 @@ $this->headTitle($this->metadata->title); $this->headTitle()->setSeparator(' - '); $this->headLink()->appendStylesheet('/css/water.css'); - $this->breadcrumb('首页'); - $this->breadcrumb(''.$this->config->title->data.''); - $this->breadcrumb(''.$this->config->title->glacier.''); - $this->breadcrumb('查看元数据'); - $this->breadcrumb()->setSeparator(' > '); - $this->headLink()->appendStylesheet('/css/water.css'); $this->theme->AppendPlus($this,'google_map_v3'); $this->theme->AppendPlus($this,'colorbox'); -?> + if(!empty($this->dataService)) { + $this->theme->AppendModel($this,"dataservice"); + } + $this->nav[] = array('link'=>"/glacier/",'title'=>$this->config->title->glacier); + $this->nav[] = array('link'=>"",'title'=>'查看元数据'); +?> +render('breadcrumbs.phtml'); ?> metadata;if ($md):?>
    -
    +
    partial('glacier/navi.phtml'); ?> -
    -
    -
    breadcrumb() ?>
    +
    +

    escape($md->title); if ($md->title_en) echo '
    '.$this->escape($md->title_en);?>


    - -
    -
    + +
    +

    @@ -37,21 +39,11 @@ if ($md->title_en) echo '
    '.$this->escape($md->title_en);?>

    - citation) : ?> -
    -

    本数据引用方式数据引用帮助

    -

    datadoi) || !strpos($md->citation,$md->datadoi)) : ?>文章的引用 - escape($md->citation);?>

    - datadoi) && !strpos($md->citation,$md->datadoi)) : ?> -

    数据的引用authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.$md->publish_year.'. doi:'.$md->doi; - echo ' ['.substr($md->author_en,1,-1).'. '.$md->title_en.'. '.$md->publisher_en.', '.$md->publish_year.'. doi:'.$md->doi.']'; - ?> (下载引用:RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式)

    - ref) : ?> + mcitation) : ?>
    -

    建议参考文献

    +

    本数据要求的多篇文献引用

      - ref as $ref) : + mcitation as $ref) : if (empty($ref->link)) echo '
    1. '.$ref->reference.'
    2. '; else @@ -59,17 +51,78 @@ if ($md->title_en) echo '
      '.$this->escape($md->title_en);?> endforeach; ?>
    - - userref) : ?> + + + citation) : ?>
    -

    数据用户发表文献

    +

    本数据引用方式数据引用帮助

    +

    datadoi) || !strpos($md->citation,$md->datadoi)) : ?>文章的引用 + escape($md->citation);if (strpos($md->citation,$md->datadoi)) : ?> + (下载引用:RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式) + +

    + datadoi) && !strpos($md->citation,$md->datadoi)) : ?> +

    数据的引用authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. doi:'.$md->doi; + echo ' ['.str_replace('"','',substr($md->author_en,1,-1)).'. '.$md->title_en.'. '.$md->publisher_en.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. doi:'.$md->doi.']'; + ?> (下载引用:RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式)

    + ref) : ?> +
    +

    相关文献(作者推荐)

    +
      + ref as $ref) : + echo '
    1. '.$ref->reference; + echo '查看'; + if (empty($ref->link)) + { + if(!empty($ref->attid)) + echo '下载'; + }else{ + echo '下载'; + } + echo "
    2. "; + endforeach; + ?> +
    + themeref) :?> + +
    +

    专题文献

    +
      + themeref as $ref) : + echo '
    1. '.$ref->reference; + echo '查看'; + if (empty($ref->link)) + { + if(!empty($ref->attid)) + echo ' | 下载'; + }else{ + echo ' | 下载'; + } + echo "
    2. "; + endforeach; + ?> +
    + userref) : ?> +
    +

    数据施引文献

      userref as $ref) : + echo '
    1. '.$ref->reference; + echo '查看'; if (empty($ref->link)) - echo '
    2. '.$ref->reference.'
    3. '; - else - echo '
    4. '.$ref->reference.' 下载
    5. '; + { + if(!empty($ref->attid)) + echo '下载'; + }else{ + echo '下载'; + } + echo ""; endforeach; + if (count($this->userref)==15) + { + echo '更多施引文献'; + } ?>
    @@ -83,8 +136,8 @@ if ($md->title_en) echo '
    '.$this->escape($md->title_en);?> ?>

    为尊重知识产权、保障数据作者的权益、扩展数据中心的服务、评估数据的应用潜力,请数据使用者在使用数据所产生的研究成果中(包括公开发表的论文、论著、数据产品和未公开发表的研究报告、数据产品等成果),明确注明数据来源和数据作者。对于转载(二次或多次发布)的数据,作者还须注明原始数据来源。

    -

    中文发表的成果参考以下规范注明: 数据来源于国家自然科学基金委员会"中国西部环境与生态科学数据中心"(http://westdc.westgis.ac.cn)

    -

    英文发表的成果依据以下规范注明: The data set is provided by Environmental and Ecological Science Data Center for West China,National Natural Science Foundation of China (http://westdc.westgis.ac.cn)

    +

    中文发表的成果参考以下规范注明: 数据来源于黑河计划数据管理中心、寒区旱区科学数据中心(http://westdc.westgis.ac.cn)

    +

    英文发表的成果依据以下规范注明: The data set is provided by Cold and Arid Regions Sciences Data Center at Lanzhou (http://westdc.westgis.ac.cn)

    data_archives){ ?> @@ -97,18 +150,18 @@ if ($md->title_en) echo '
    '.$this->escape($md->title_en);?>
    - suppinfo || $this->fund) : ?> -

    资助项目

    - fund)) : ?> -
      - fund as $k=>$v) : ?> -
    • (项目编号:) [(No. )]
    • - -
    - suppinfo)) : ?> - '.str_replace(array("\r\n", "\n", "\r"),'

    ',$this->escape($md->suppinfo)).'

    ';?> - -
    + suppinfo || $this->fund) : ?> +

    资助项目

    + fund)) : ?> +
      + fund as $k=>$v) : ?> +
    • (项目编号:) [(No. )]
    • + +
    + suppinfo)) : ?> + '.str_replace(array("\r\n", "\n", "\r"),'

    ',$this->escape($md->suppinfo)).'

    ';?> + +
    resources) : ?>

    相关资源

    @@ -251,7 +304,7 @@ if ($md->title_en) echo '
    '.$this->escape($md->title_en);?>
    -
    +
    @@ -412,7 +476,7 @@ endforeach;
    -
    +
    @@ -444,6 +508,9 @@ $(function() { googleSearch(''); } }); + $('#show-list').click(function(e) { + method.filelist.get($(this).attr('rel')); + }); }); //ajax literature function literature(page){ @@ -460,10 +527,6 @@ function recommend(page){ recommend_get(page,'uuid; ?>'); } -function getFileList(){ - getFileList_h('uuid;?>'); -} - function ajaxpage(page){ ajaxpage_get(page,'uuid; ?>'); } diff --git a/application/default/views/scripts/glacier/yangtze.phtml b/application/default/views/scripts/glacier/yangtze.phtml deleted file mode 100644 index ffdd5286..00000000 --- a/application/default/views/scripts/glacier/yangtze.phtml +++ /dev/null @@ -1,33 +0,0 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->data); -$this->headTitle()->setSeparator(' - '); -$this->headLink()->appendStylesheet('/css/water.css'); -$this->breadcrumb('首页'); -$this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->glacier.''); -$this->breadcrumb('长江源区'); -$this->breadcrumb()->setSeparator(' > '); -?> - - - diff --git a/application/default/views/scripts/haihe/base.phtml b/application/default/views/scripts/haihe/base.phtml new file mode 100644 index 00000000..4c53ca20 --- /dev/null +++ b/application/default/views/scripts/haihe/base.phtml @@ -0,0 +1,30 @@ +headTitle($this->config->title->site); +$this->headTitle($this->config->title->data); +$this->headTitle()->setSeparator(' - '); +$this->headLink()->appendStylesheet('/css/water.css'); +$this->nav[] = array('link'=>"/haihe",'title'=>'海河流域观测数据集'); +?> +render('breadcrumbs.phtml'); ?> +
    +
    + partial('haihe/navi.phtml'); ?> +
    +
    + info) : ?> +
    + info['body'])) echo $this->info['body'];?> +
    + + metadata) : ?> + page->getNavigation(); ?> +
    +
      + metadata as $md) : ?> +
    1. + +
    +
    + +
    +
    \ No newline at end of file diff --git a/application/default/views/scripts/haihe/document.phtml b/application/default/views/scripts/haihe/document.phtml new file mode 100644 index 00000000..370b05ff --- /dev/null +++ b/application/default/views/scripts/haihe/document.phtml @@ -0,0 +1,51 @@ +headTitle($this->config->title->site); +$this->headTitle($this->config->title->data); +$this->headTitle()->setSeparator(' - '); +$this->headLink()->appendStylesheet('/css/water.css'); +$this->breadcrumb('首页'); +$this->breadcrumb()->setSeparator(' > '); +$this->theme->AppendPlus($this,'colorbox'); +$this->nav[] = array('link'=>"/haihe",'title'=>'海河流域观测数据集'); +?> +render('breadcrumbs.phtml'); ?> +
    +
    + partial('haihe/navi.phtml'); ?> +
    + +
    +

    数据相关文献

    + refs) : ?> + page->getNavigation(); ?> +
    +
      + refs as $md) : ?> +
    1. 查看'; + if (!empty($md['link'])) : + echo ' 下载'; + else : + if (!empty($md['attid'])) echo ' 下载'; + endif; + ?> + 相关数据] +
    2. + +
    +
    + +
    +
    + \ No newline at end of file diff --git a/application/default/views/scripts/haihe/index.phtml b/application/default/views/scripts/haihe/index.phtml new file mode 100644 index 00000000..11407b57 --- /dev/null +++ b/application/default/views/scripts/haihe/index.phtml @@ -0,0 +1,22 @@ +headTitle($this->config->title->site); +$this->headTitle($this->config->title->data); +$this->headTitle()->setSeparator(' - '); +$this->headLink()->appendStylesheet('/css/water.css'); +$this->nav[] = array('link'=>"/haihe",'title'=>'海河流域观测数据集'); +?> +render('breadcrumbs.phtml'); ?> +
    +
    + partial('haihe/navi.phtml'); ?> +
    + +
    +
    +

    info['title'])) echo $this->info['title']; ?>

    + + +
    info['body'])) echo $this->info['body'];?>
    +
    +
    +
    diff --git a/application/default/views/scripts/haihe/navi.phtml b/application/default/views/scripts/haihe/navi.phtml new file mode 100644 index 00000000..ad49c1a3 --- /dev/null +++ b/application/default/views/scripts/haihe/navi.phtml @@ -0,0 +1,38 @@ + \ No newline at end of file diff --git a/application/default/views/scripts/haihe/view.phtml b/application/default/views/scripts/haihe/view.phtml new file mode 100755 index 00000000..3eff1e69 --- /dev/null +++ b/application/default/views/scripts/haihe/view.phtml @@ -0,0 +1,578 @@ +headTitle($this->config->title->site); + $this->headTitle($this->config->title->data); + $this->headTitle($this->metadata->title); + $this->headTitle()->setSeparator(' - '); + $this->breadcrumb('首页'); + $this->breadcrumb(''.$this->config->title->data.''); + $this->breadcrumb('查看元数据'); + $this->breadcrumb()->setSeparator(' > '); + $this->theme->AppendPlus($this,'google_map_v3'); + $this->theme->AppendPlus($this,'colorbox'); + if(!empty($this->dataService)) { + $this->theme->AppendModel($this,"dataservice"); + } + $this->nav[] = array('link'=>"/haihe",'title'=>'海河流域观测数据集'); +?> + +render('breadcrumbs.phtml'); ?> +metadata;if ($md):?> +

    escape($md->title); +if ($md->title_en) echo '
    '.$this->escape($md->title_en);?> +

    +
    +
    +
    +
    + +

    +

    ',$md->description);?> +

    +
    +
    + mcitation) : ?> +
    +

    本数据要求的多篇文献引用

    +
      + mcitation as $ref) : + echo '
    1. '.$ref->reference; + echo '查看'; + if (empty($ref->link)) + { + if(!empty($ref->attid)) + echo '下载'; + }else{ + echo '下载'; + } + echo "
    2. "; + endforeach; + ?> +
    + + citation) : ?> +
    +

    本数据引用方式数据引用帮助

    +

    datadoi) || !strpos($md->citation,$md->datadoi)) : ?>文章的引用 + escape($md->citation);if (strpos($md->citation,$md->datadoi)) : ?> + (下载引用:RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式) + +

    + datadoi) && !strpos($md->citation,$md->datadoi)) : ?> +

    数据的引用authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. doi:'.$md->doi; + echo ' ['.str_replace('"','',substr($md->author_en,1,-1)).'. '.$md->title_en.'. '.$md->publisher_en.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. doi:'.$md->doi.']'; + ?> (下载引用:RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式)

    + ref) : ?> +
    +

    相关文献(作者推荐)

    +
      + ref as $ref) : + echo '
    1. '.$ref->reference; + echo '查看'; + if (empty($ref->link)) + { + if(!empty($ref->attid)) + echo '下载'; + }else{ + echo '下载'; + } + echo "
    2. "; + endforeach; + ?> +
    + themeref) :?> + +
    +

    专题文献

    +
      + themeref as $ref) : + echo '
    1. '.$ref->reference; + echo '查看'; + if (empty($ref->link)) + { + if(!empty($ref->attid)) + echo ' | 下载'; + }else{ + echo ' | 下载'; + } + echo "
    2. "; + endforeach; + ?> +
    + userref) : ?> +
    +

    数据施引文献

    +
      + userref as $ref) : + echo '
    1. '.$ref->reference; + echo '查看'; + if (empty($ref->link)) + { + if(!empty($ref->attid)) + echo '下载'; + }else{ + echo '下载'; + } + echo "
    2. "; + endforeach; + if (count($this->userref)==15) + { + echo '更多施引文献'; + } + ?> +
    + +
    +

    数据使用声明

    + uselimits) : + foreach($this->uselimits as $uselimit) : + echo '

    '.str_replace(array("\r\n", "\n", "\r"),'

    ',$this->escape($uselimit->uselimit)).'

    '; + endforeach; + ?> + +

    为尊重知识产权、保障数据作者的权益、扩展数据中心的服务、评估数据的应用潜力,请数据使用者在使用数据所产生的研究成果中(包括公开发表的论文、论著、数据产品和未公开发表的研究报告、数据产品等成果),明确注明数据来源和数据作者。对于转载(二次或多次发布)的数据,作者还须注明原始数据来源。

    +

    中文发表的成果参考以下规范注明: 数据来源于黑河计划数据管理中心、寒区旱区科学数据中心(http://westdc.westgis.ac.cn)

    +

    英文发表的成果依据以下规范注明: The data set is provided by Cold and Arid Regions Sciences Data Center at Lanzhou (http://westdc.westgis.ac.cn)

    +

    + + data_archives){ ?> +

    数据相关新闻

    +
      + data_archives as $v){?> +
    • + +
    +
    + + suppinfo || $this->fund) : ?> +

    资助项目

    + fund)) : ?> +
      + fund as $k=>$v) : ?> +
    • (项目编号:) [(No. )]
    • + +
    + suppinfo)) : ?> + '.str_replace(array("\r\n", "\n", "\r"),'

    ',$this->escape($md->suppinfo)).'

    ';?> + +
    + + resources) : ?> +

    相关资源

    + +
    + +
    +
    + keys as $cg){ + if($cg['keytype']=="theme") + $keywords[]=$cg['keyword']; + } + $ev = join(" ",$keywords); + ?> +
    + +
    + + +
    +
      +
      +
      + downhistory) : ?> +

      最近10条服务记录如下:

      +
        + downhistory as $v){ + echo '
      1. '.date("Y-m-d",strtotime($v->ts_created))." ".$v->unit." ".$v->realname; + if (!empty($v->offlineproject)) + echo ' 用途:'.$v->offlineproject; + elseif (!empty($v->onlineproject)) + echo ' 用途:'.$v->onlineproject; + echo '
      2. '; + } + ?> +
      + + 暂时没有服务记录,欢迎您下载使用! + +
      +
      + +
      +
      +
      +
      +
      + status>0 and $md->status<5) : ?> +

      此数据还在评审过程中,我们真切地邀请您参加此数据的评审,以便我们能尽快发布此数据!评审

      + +

      数据评论

      +
      +
      评论加载中
      +
      + hasIdentity()) + { + $user = $auth->getIdentity(); + $name = $user->realname; + $email = $user->email; + }else + { + $name = ""; + $email = ""; + } + ?> +
      +
      + +
      + +
      +
      +
      + +
      + +
      +
      +
      + +
      + e.g. http://westdc.westgis.ac.cn/ +
      +
      +
      + +
      + +
      +
      +
      + +
      + +
      +
      +
      +
      + + + 提交 +
      +
      +
      +
      + +
      +
      +
      +
      + + '学科','place'=>'地点','theme'=>'主题','temporal'=>'时间词','stratum'=>'地层'); +$kt=''; +$i=0; +foreach($this->keys as $cg) : + if ($kt==$cg['keytype']) : + $i+=1; + else : + if (!empty($kt)) echo ''; + $kt=$cg['keytype']; + $i=0; + endif; + if ($i==0) { + ?> + + doi) : ?> +
      • 数据DOI:doi; ?>
      + +
      +
      +

      数据细节文件列表

      +
        + fileformat) : ?> +
      • 格式:fileformat; ?>
      • + +
      • 大小:filesize; ?>MB
      • + downloaded>9) :?> +
      • 下载:downloaded; ?>次
      • + +
      • 浏览:viewed; ?>次
      • + + timebegin)) : ?> +
      • 数据时间范围:timebegin));if (!empty($md->timeend)) echo " 至 ".date('Y-m-d',strtotime($md->timeend)); ?>
      • + + doc)) : ?> + + + attachments) : ?> +
      • 相关文档: + attachments as $k=>$a) : ?> + + + +
      • + +
      • 数据共享方式:datatype) print "离线"; else print "在线(可直接下载)";?>
      • +
      +
      + status>0 and $md->status<5) : ?> + 数据评审 + datatype) : ?> + + 在线下载 + + + dataService)) { ?> + theme->AppendPlus($this,'datepicker'); ?> + + + + + 放入数据篮 + + + + 收藏此数据 + +
      +
      +
      +

      空间位置

      +
      +
      +

      联系信息

      +
      +
        + '资源提供者','custodian'=>'维护者','owner'=>'拥有者','user'=>'用户','distributor'=>'数据服务联系人','originator'=>'创建者','pointOfContact'=>'联系人','principalInvestigator'=>'数据调查与处理者','processor'=>'处理者','publisher'=>'元数据发布者','author'=>'元数据作者'); + $r=''; + $i=0; + foreach($this->authors as $k=>$author) : + if ($author->role!=$r) + { + $r=$author->role; + $i=0; + if ($k>0) echo ''; + echo '
      • '.$party_zh[$author->role].':'; + } + if ($i>0) echo ','; + $i+=1; + if (!empty($author->email) && $r!='principalInvestigator') + echo ''; + echo ''; + if (!empty($author->individual)) + echo $author->individual; + else + echo $author->organisation; + echo ''; + if (!empty($author->email)) echo ''; + if ($k+1==count($this->authors)) echo '
      • '; + endforeach; + ?> +
      +
      +
        +
      • 元数据更新时间:ts_created)); ?>
      • +
      • 下载元数据: + Adobe PDF格式 + OpenOffice odt格式 + Word doc格式 + 查看XML源文件 +
      • + + version->c>0):?> +
      • 版本历史:version->c ?> 个
      • + +
      +
      + +
      +
      +
      分享到
      + +
      + + + + + + + + + +
      + +
      +
      +
      + + + +

      Cannot find the metadata.

      +

      没有找到对应的元数据。

      + + + diff --git a/application/default/views/scripts/header.phtml b/application/default/views/scripts/header.phtml index c926f63a..4669f345 100755 --- a/application/default/views/scripts/header.phtml +++ b/application/default/views/scripts/header.phtml @@ -1,7 +1,7 @@
      -
      +
      @@ -520,4 +554,4 @@ var bound = {

      没有找到对应的元数据。

      - \ No newline at end of file + \ No newline at end of file diff --git a/application/default/views/scripts/hiwater/list.phtml b/application/default/views/scripts/hiwater/list.phtml index f2e67d7b..8f25ebdb 100644 --- a/application/default/views/scripts/hiwater/list.phtml +++ b/application/default/views/scripts/hiwater/list.phtml @@ -5,16 +5,16 @@ $this->headTitle()->setSeparator(' - '); $this->headLink()->appendStylesheet('/css/water.css'); $this->breadcrumb('首页'); $this->breadcrumb(''.$this->config->title->data.''); -$this->breadcrumb(''.$this->config->title->heihe.''); +$this->breadcrumb(''.$this->config->title->hiwater.''); $this->breadcrumb('数据列表'); $this->breadcrumb()->setSeparator(' > '); $this->theme->AppendPlus($this,'colorbox'); ?>
      -
      +
      partial('hiwater/navi.phtml'); ?>
      -
      +
      breadcrumb() ?>
      metadata) : ?> @@ -22,12 +22,12 @@ $this->theme->AppendPlus($this,'colorbox');
        metadata as $md) : ?>
      1. - + [缩略图幻灯片] - [PDF版本下载] - [ODT版本下载] - [DOC版本下载] + [PDF版本下载] + [ODT版本下载] + [DOC版本下载]
      2. diff --git a/application/default/views/scripts/hiwater/view.phtml b/application/default/views/scripts/hiwater/view.phtml index 4178c489..ff449a18 100644 --- a/application/default/views/scripts/hiwater/view.phtml +++ b/application/default/views/scripts/hiwater/view.phtml @@ -46,9 +46,16 @@ if ($md->title_en) echo '
        '.$this->escape($md->title_en);?>
          mcitation as $ref) : if (empty($ref->link)) - echo '
        1. '.$ref->reference.'
        2. '; + { + echo '
        3. '.$ref->reference; + echo '查看'; + if(!empty($ref->attid)) { + echo ' 下载'; + } + echo "
        4. "; + } else - echo '
        5. '.$ref->reference.' 下载
        6. '; + echo '
        7. '.$ref->reference.'查看 下载
        8. '; endforeach; ?>
        @@ -69,27 +76,61 @@ if ($md->title_en) echo '
        '.$this->escape($md->title_en);?> ?> (下载引用:RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式)

        ref) : ?>
        -

        建议参考文献

        +

        相关文献(作者推荐)

          ref as $ref) : + echo '
        1. '.$ref->reference; + echo '查看'; if (empty($ref->link)) - echo '
        2. '.$ref->reference.'
        3. '; - else - echo '
        4. '.$ref->reference.' 下载
        5. '; + { + if(!empty($ref->attid)) + echo '下载'; + }else{ + echo '下载'; + } + echo ""; endforeach; ?>
        - - userref) : ?> + themeref) :?> +
        -

        数据用户发表文献

        +

        专题文献

        +
          + themeref as $ref) : + echo '
        1. '.$ref->reference; + echo '查看'; + if (empty($ref->link)) + { + if(!empty($ref->attid)) + echo ' | 下载'; + }else{ + echo ' | 下载'; + } + echo "
        2. "; + endforeach; + ?> +
        + userref) : ?> +
        +

        数据施引文献

          userref as $ref) : + echo '
        1. '.$ref->reference; + echo '查看'; if (empty($ref->link)) - echo '
        2. '.$ref->reference.'
        3. '; - else - echo '
        4. '.$ref->reference.' 下载
        5. '; + { + if(!empty($ref->attid)) + echo '下载'; + }else{ + echo '下载'; + } + echo ""; endforeach; + if (count($this->userref)==15) + { + echo '更多施引文献'; + } ?>
        @@ -122,7 +163,7 @@ if ($md->title_en) echo '
        '.$this->escape($md->title_en);?> fund)) : ?>
          fund as $k=>$v) : ?> -
        • (项目编号:) [(No. )]
        • +
        • (项目编号:) [(No. )]
        suppinfo)) : ?> diff --git a/application/default/views/scripts/index/index.phtml b/application/default/views/scripts/index/index.phtml index 1867014d..929ee88f 100755 --- a/application/default/views/scripts/index/index.phtml +++ b/application/default/views/scripts/index/index.phtml @@ -42,9 +42,12 @@

      新闻

      -
      @@ -83,7 +86,7 @@
      -

      青海省草原总站

      +

      青海省草原总站

      @@ -110,7 +113,7 @@
      -

      青海省林业调查规划院

      +

      青海省林业调查规划院

      @@ -126,7 +129,7 @@
      -

      青海省水文水资源局

      +

      青海省水文水资源局

      diff --git a/application/default/views/scripts/knowledge/author.phtml b/application/default/views/scripts/knowledge/author.phtml index 88a92cf9..2ed61408 100644 --- a/application/default/views/scripts/knowledge/author.phtml +++ b/application/default/views/scripts/knowledge/author.phtml @@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - '); $this->headLink()->appendStylesheet('/css/mdreview.css'); $this->breadcrumb('首页'); $this->breadcrumb('知识积累'); -$this->breadcrumb('数据作者'); +$this->breadcrumb('作者推荐文献库'); $this->breadcrumb()->setSeparator(' > '); $this->headScript()->appendFile('/js/jquery.colorbox-min.js'); $this->headLink()->appendStylesheet('/css/colorbox.css'); @@ -16,20 +16,23 @@ $this->headLink()->appendStylesheet('/css/colorbox.css');
      -

      数据作者文献库

      +

      作者推荐文献库

      - paginator)): ?> -
        - paginator as $item): ?> -
      • - 下载'; - endif; + paginator)): ?> +
          + paginator as $item): ?> +
        1. 查看'; + if (!empty($item['link'])) : + echo ' 下载'; + else : + if (!empty($item['attid'])) echo ' 下载'; + endif; ?> - 相关数据 -
        2. - -
      + 相关数据 + + +
      diff --git a/application/default/views/scripts/knowledge/datacenter.phtml b/application/default/views/scripts/knowledge/datacenter.phtml index afbf6bb9..29ec7c29 100644 --- a/application/default/views/scripts/knowledge/datacenter.phtml +++ b/application/default/views/scripts/knowledge/datacenter.phtml @@ -17,16 +17,21 @@ $this->breadcrumb()->setSeparator(' > ');

      数据中心文献库

      paginator)): ?> -
        +
          paginator as $item): ?> -
        1. - 下载'; - endif; +
        2. 数据中心施引文献'; + echo $item['reference']; + echo ' 查看'; + if (!empty($item['link'])) : + echo ' 下载'; + else : + if (!empty($item['attid'])) echo ' 下载'; + endif; ?>
        3. -
      +
      diff --git a/application/default/views/scripts/knowledge/index.phtml b/application/default/views/scripts/knowledge/index.phtml index 66596a82..a9765cbb 100755 --- a/application/default/views/scripts/knowledge/index.phtml +++ b/application/default/views/scripts/knowledge/index.phtml @@ -10,16 +10,6 @@ $this->breadcrumb()->setSeparator(' > ');