diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php index 78641121..52693596 100755 --- a/application/admin/controllers/DataController.php +++ b/application/admin/controllers/DataController.php @@ -503,7 +503,7 @@ class Admin_DataController extends Zend_Controller_Action LEFT JOIN mdstat s ON md.uuid=s.uuid LEFT JOIN geonetworkmetadata g ON g.uuid=md.uuid LEFT JOIN mdstatus st ON md.uuid=st.uuid - LEFT JOIN dataset ds ON md.uuid=ds.uuid + LEFT JOIN dataset ds ON md.uuid=ds.uuid and ds.lang in ('','cn') left join en.geonetworkmetadata gen on gen.uuid=md.uuid left join (select count(uuid) as stid,uuid from dataspatial group by uuid) as spatial on spatial.uuid=md.uuid ORDER BY md.id DESC"; @@ -537,7 +537,7 @@ class Admin_DataController extends Zend_Controller_Action $this->_helper->viewRenderer('md-dataset'); $uuid = $this->_request->getParam('uuid'); - $sql = "SELECT * FROM dataset WHERE uuid=?"; + $sql = "SELECT * FROM dataset WHERE uuid=? and lang in ('','cn')"; $sth = $this->db->prepare($sql); $sth ->execute(array($uuid)); $row = $sth->fetch(); @@ -554,16 +554,17 @@ class Admin_DataController extends Zend_Controller_Action $uuid = $this->_request->getParam('uuid'); $host = $this->_getParam('host'); $path = $this->_getParam('path'); + $lang = $this->_getParam('lang'); - $sql = "UPDATE dataset SET host=?,path=? WHERE uuid=?"; + $sql = "UPDATE dataset SET host=?,path=?,lang=? WHERE uuid=?"; $sth = $this->db->prepare($sql); - $ds = $sth ->execute(array($host,$path,$uuid)); + $ds = $sth ->execute(array($host,$path,$lang,$uuid)); if ($host=='ftp1.westgis.ac.cn') { - file_get_contents("http://ftp1.westgis.ac.cn/proftp_upload.php?uuid=".$uuid."&filelist=1"); + file_get_contents("http://ftp1.westgis.ac.cn/proftp_upload.php?uuid=".$uuid."&filelist=1&lang=".$lang); } else if ($host=='ftp2.westgis.ac.cn') { - file_get_contents("http://ftp2.westgis.ac.cn/proftp_upload.php?uuid=".$uuid."&filelist=1"); + file_get_contents("http://ftp2.westgis.ac.cn/proftp_upload.php?uuid=".$uuid."&filelist=1&lang=".$lang); } if($ds) @@ -586,10 +587,11 @@ class Admin_DataController extends Zend_Controller_Action $uuid = $this->_request->getParam('uuid'); $host = $this->_getParam('host'); $path = $this->_getParam('path'); + $lang = $this->_getParam('lang'); - $sql = "SELECT * FROM dataset WHERE uuid=?"; + $sql = "SELECT * FROM dataset WHERE uuid=? and lang=?"; $sth = $this->db->prepare($sql); - $sth ->execute(array($uuid)); + $sth ->execute(array($uuid,$lang)); $row = $sth->fetch(); if(!empty($row['id'])) { @@ -598,15 +600,15 @@ class Admin_DataController extends Zend_Controller_Action return true; } - $sql = "INSERT INTO dataset (uuid,host,path) VALUES (?,?,?)"; + $sql = "INSERT INTO dataset (uuid,host,path,lang) VALUES (?,?,?,?)"; $sth = $this->db->prepare($sql); - $ds = $sth ->execute(array($uuid,$host,$path)); + $ds = $sth ->execute(array($uuid,$host,$path,$lang)); if ($host=='ftp1.westgis.ac.cn') { - file_get_contents("http://ftp1.westgis.ac.cn/proftp_upload.php?uuid=".$uuid."&filelist=1"); + file_get_contents("http://ftp1.westgis.ac.cn/proftp_upload.php?uuid=".$uuid."&filelist=1&lang=".$lang); } else if ($host=='ftp2.westgis.ac.cn') { - file_get_contents("http://ftp2.westgis.ac.cn/proftp_upload.php?uuid=".$uuid."&filelist=1"); + file_get_contents("http://ftp2.westgis.ac.cn/proftp_upload.php?uuid=".$uuid."&filelist=1&lang=".$lang); } if($ds) @@ -626,18 +628,18 @@ class Admin_DataController extends Zend_Controller_Action $this->_helper->viewRenderer->setNoRender(); $uuid = $this->_request->getParam('uuid'); - $sql = "SELECT * FROM dataset WHERE uuid=?"; + $sql = "SELECT * FROM dataset WHERE uuid=? and lang in ('','cn')"; $sth = $this->db->prepare($sql); $sth ->execute(array($uuid)); $row = $sth->fetch(); if ($row['host']=='ftp1.westgis.ac.cn') { - file_get_contents("http://ftp1.westgis.ac.cn/proftp_upload.php?uuid=".$uuid."&filelist=1"); + file_get_contents("http://ftp1.westgis.ac.cn/proftp_upload.php?uuid=".$uuid."&filelist=1&lang=".$row['lang']); echo '

数据目录成功导入!

'; } else if ($row['host']=='ftp2.westgis.ac.cn') { - file_get_contents("http://ftp2.westgis.ac.cn/proftp_upload.php?uuid=".$uuid."&filelist=1"); + file_get_contents("http://ftp2.westgis.ac.cn/proftp_upload.php?uuid=".$uuid."&filelist=1&lang=".$row['lang']); echo '

数据目录成功导入!

'; } else { echo '

数据目录未导入!

'; diff --git a/application/admin/views/scripts/data/md-dataset.phtml b/application/admin/views/scripts/data/md-dataset.phtml index 067affe0..871964c1 100644 --- a/application/admin/views/scripts/data/md-dataset.phtml +++ b/application/admin/views/scripts/data/md-dataset.phtml @@ -24,10 +24,16 @@ {?>

主机:

路径:

+

语言:
dataset['lang']=='') echo 'checked="checked"'; ?> /> 不限制语言 + dataset['lang']=='cn') echo 'checked="checked"'; ?> /> 中文 + dataset['lang']=='en') echo 'checked="checked"'; ?> /> 英文

主机:

路径:

+

语言:
不限制语言 + 中文 + 英文

diff --git a/application/default/controllers/ServiceController.php b/application/default/controllers/ServiceController.php index eede4257..3bdcfd2f 100644 --- a/application/default/controllers/ServiceController.php +++ b/application/default/controllers/ServiceController.php @@ -867,7 +867,7 @@ class ServiceController extends Zend_Controller_Action $this->_helper->viewRenderer->setNoRender(); $uuid=$this->_request->getParam('uuid'); - $sql="select f.filename,f.id,s.uuid,f.depth,f.filesize as filesize,f.ts_created from datafile f,dataset s where s.id=f.dsid and s.uuid=? and f.depth=1 and f.filename<>'/uuid.txt' order by f.isdir desc,f.filename"; + $sql="select f.filename,f.id,s.uuid,f.depth,f.filesize as filesize,f.ts_created from datafile f,dataset s where s.id=f.dsid and s.lang in ('','cn') and s.uuid=? and f.depth=1 and f.filename<>'/uuid.txt' order by f.isdir desc,f.filename"; $files=$this->db->fetchAll($this->db->quoteInto($sql,$uuid)); //文件大小处理 foreach($files as $k=>$v) @@ -898,7 +898,7 @@ class ServiceController extends Zend_Controller_Action $subpath=(int)$this->_request->getParam('subpath'); $depth=(int)$this->_request->getParam('depth'); $depth++; - $sql="select f.*,s.uuid from datafile f,dataset s where s.id=f.dsid and s.uuid=? and f.depth=".$depth." and f.filename<>'/uuid.txt' and f.filename ilike (select filename from datafile where id=".$subpath.")||'%' order by f.isdir desc,f.filename"; + $sql="select f.*,s.uuid from datafile f,dataset s where s.id=f.dsid and s.lang in ('','cn') and s.uuid=? and f.depth=".$depth." and f.filename<>'/uuid.txt' and f.filename ilike (select filename from datafile where id=".$subpath.")||'%' order by f.isdir desc,f.filename"; $files=$this->db->fetchAll($this->db->quoteInto($sql,$uuid)); foreach($files as $k=>$v)