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 @@
WESTDC有元数据mdcount->westdccount; ?>条,GEONETWORK有元数据mdcount->gncount; ?>条,WATER中元数据mdcount->watergncount; ?>条。
+WESTDC有元数据mdcount->westdccount; ?>条,GEONETWORK有元数据mdcount->gncount; ?>条。
开始同步:从GEONETWORK同步到WESTDC,若有冲突,以GEONETWORK为准
-开始同步:从water同步到WESTDC,若有冲突,以water为准
- - - - 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 @@