diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php index 79b5a2ce..cd406c28 100755 --- a/application/admin/controllers/DataController.php +++ b/application/admin/controllers/DataController.php @@ -22,7 +22,7 @@ class Admin_DataController extends Zend_Controller_Action function syncAction() { set_time_limit(0); - $sql="select * from (select count(*) as westdccount from metadata) as t1,(select count(uuid) as gncount from geonetworkmetadata where schemaid='iso19115') as t2,(select count(uuid) as watergncount from watergn where schemaid='iso19115') as t3"; + $sql="select * from (select count(*) as westdccount from metadata) as t1,(select count(uuid) as gncount from geonetworkmetadata where schemaid='iso19115') as t2"; $this->db->setFetchMode(Zend_Db::FETCH_OBJ); $this->view->mdcount=$this->db->fetchRow($sql); $source=$this->_request->getParam('source'); @@ -31,8 +31,6 @@ class Admin_DataController extends Zend_Controller_Action $list=$this->_request->getParam('list'); $adminuser=$this->_request->getParam('adminuser'); $uuid=trim($this->_request->getParam('uuid')); - if ($this->_request->isPost()) $uuid=$this->_request->getPost('uuid'); - //$uuid=$this->_request->getParam('uuid'); if ($source=="geonetwork" && empty($uuid) ) { //从geonetwork向WESTDC同步 $sql="select uuid,data,source from geonetworkmetadata where schemaid='iso19115'"; diff --git a/application/admin/views/scripts/data/left.phtml b/application/admin/views/scripts/data/left.phtml index 09edc19e..00dc51ed 100644 --- a/application/admin/views/scripts/data/left.phtml +++ b/application/admin/views/scripts/data/left.phtml @@ -3,13 +3,8 @@
  • 元数据管理
  • 数据反馈管理
  • 数据文献关联管理
  • -
  • 上传元数据文件
  • -
  • 导入服务器元数据目录
  • 导入数据目录
  • 同步GeoNetwork元数据
  • -
  • 特色数据集管理
  • -
  • 数据中心通讯管理
  • 特色推荐
  • -
  • 项目来源管理
  • -
  • 附件管理
  • +
  • 数据附件管理
  • \ No newline at end of file diff --git a/application/admin/views/scripts/data/sync.phtml b/application/admin/views/scripts/data/sync.phtml index 345b8c7f..d2b4c9f0 100644 --- a/application/admin/views/scripts/data/sync.phtml +++ b/application/admin/views/scripts/data/sync.phtml @@ -23,21 +23,15 @@ -

    WESTDC有元数据mdcount->westdccount; ?>条,GEONETWORK有元数据mdcount->gncount; ?>条,WATER中元数据mdcount->watergncount; ?>条。

    +

    WESTDC有元数据mdcount->westdccount; ?>条,GEONETWORK有元数据mdcount->gncount; ?>条。

    开始同步:从GEONETWORK同步到WESTDC,若有冲突,以GEONETWORK为准

    -

    开始同步:从water同步到WESTDC,若有冲突,以water为准

    开始同步:从WESTDC同步到GEONETWORK

    -

    列出WESTDC中多出的WATER元数据

    删除WESTDC中多出的元数据

    删除GEONETWORK中多出的元数据

    -

    删除WESTDC中多出的WATER元数据

    同步GEONETWORK中的缩略图

    -

    同步WATER中的缩略图

    -

    同步帐号到GEONETWORK(仅供初始化使用)

    指定元数据UUID:

    -
    metadata) : ?> diff --git a/application/admin/views/scripts/down/left.phtml b/application/admin/views/scripts/down/left.phtml index 0736736f..8020dbd7 100644 --- a/application/admin/views/scripts/down/left.phtml +++ b/application/admin/views/scripts/down/left.phtml @@ -1,9 +1,8 @@ \ No newline at end of file