bob
/
westdc-zf1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

abort the errors

This commit is contained in:
Li Jianxuan 2013-04-27 02:43:02 +00:00
parent f47259c193
commit 194b8d3a5e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
application/admin/controllers/DataController.php
View File

@ -791,7 +791,7 @@ class Admin_DataController extends Zend_Controller_Action
{ {
//导入元数据 //导入元数据
$iso=new ISO19115(); $iso=new ISO19115();
$iso->saveDB($this->db,$row['xml']); @$iso->saveDB($this->db,$row['xml']);
//进入评审库 //进入评审库
$sql="insert into mdstatus (uuid,status,userid) select uuid,0,? from mdversion where id=?"; $sql="insert into mdstatus (uuid,status,userid) select uuid,0,? from mdversion where id=?";
$this->db->query($sql,array($u_id,$id)); $this->db->query($sql,array($u_id,$id));
@ -845,7 +845,7 @@ class Admin_DataController extends Zend_Controller_Action
} else { //说明是已发布的数据且数据不存在评审信息 } else { //说明是已发布的数据且数据不存在评审信息
//同步元数据 //同步元数据
$iso=new ISO19115(); $iso=new ISO19115();
$iso->saveDB($this->db,$row['xml']); @$iso->saveDB($this->db,$row['xml']);
//移除中间版本 //移除中间版本
$sql="delete from mdversion where uuid in (select uuid from mdversion where id=?) and changelog is null"; $sql="delete from mdversion where uuid in (select uuid from mdversion where id=?) and changelog is null";
$this->db->query($sql,array($id)); $this->db->query($sql,array($id));
@ -884,7 +884,7 @@ class Admin_DataController extends Zend_Controller_Action
{ {
//同步元数据 //同步元数据
$iso=new ISO19115(); $iso=new ISO19115();
$iso->saveDB($this->db,$row['xml']); @$iso->saveDB($this->db,$row['xml']);
//email to admin //email to admin
$mail=new WestdcMailer($this->view->config->smtp); $mail=new WestdcMailer($this->view->config->smtp);
$mail->setFrom($this->view->config->service->email,'西部数据中心服务组'); $mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
@ -937,7 +937,7 @@ class Admin_DataController extends Zend_Controller_Action
{ {
//同步元数据 //同步元数据
$iso=new ISO19115(); $iso=new ISO19115();
$iso->saveDB($this->db,$row['xml']); @$iso->saveDB($this->db,$row['xml']);
//email to admin //email to admin
$mail=new WestdcMailer($this->view->config->smtp); $mail=new WestdcMailer($this->view->config->smtp);
@ -1023,7 +1023,7 @@ class Admin_DataController extends Zend_Controller_Action
{ {
//同步元数据 //同步元数据
$iso=new ISO19115(); $iso=new ISO19115();
$iso->saveDB($this->db,$row['xml']); @$iso->saveDB($this->db,$row['xml']);
//移除中间版本 //移除中间版本
$sql="delete from mdversion where uuid in (select uuid from mdversion where id=?) and changelog is null"; $sql="delete from mdversion where uuid in (select uuid from mdversion where id=?) and changelog is null";
$this->db->query($sql,array($id)); $this->db->query($sql,array($id));
@ -2405,7 +2405,7 @@ class Admin_DataController extends Zend_Controller_Action
private function import($xml) private function import($xml)
{ {
$iso=new ISO19115(); $iso=new ISO19115();
$iso->saveDB($this->db,$xml); @$iso->saveDB($this->db,$xml);
} }
public function jsonexit($data){ public function jsonexit($data){