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

fix version release error

This commit is contained in:
wlx 2012-06-26 09:03:23 +00:00
parent fd6fe13cc7
commit a196207e81
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/default/controllers/AuthorController.php
View File

@ -1729,7 +1729,7 @@ class AuthorController extends Zend_Controller_Action
{
//导入元数据
$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=?";
$this->db->query($sql,array($u_id,$id));
@ -1783,7 +1783,7 @@ class AuthorController extends Zend_Controller_Action
} else { //说明是已发布的数据
//同步元数据
$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";
$this->db->query($sql,array($id));
@ -1822,7 +1822,7 @@ class AuthorController extends Zend_Controller_Action
{
//同步元数据
$iso=new ISO19115();
$iso->saveDB($this->db,$row['xml']);
@$iso->saveDB($this->db,$row['xml']);
//email to admin
$mail=new WestdcMailer($this->view->config->smtp);
$mail->setFrom($this->view->config->service->email,$this->view->config->service->poster);
@ -1951,7 +1951,7 @@ class AuthorController extends Zend_Controller_Action
{
//同步元数据
$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";
$this->db->query($sql,array($id));
@ -1978,7 +1978,7 @@ class AuthorController extends Zend_Controller_Action
}
@$mail->send();
$data = array("commited"=>1,"error"=>$this->alertbox('ok','该版本已经成功发布!'));
$data = array("commited"=>1,"error"=>'该版本已经成功发布!');
$this->jsonexit($data);
return true;
}

8
application/models/ISO19115.php
View File

@ -325,7 +325,7 @@ class ISO19115
function parse()
{
$this->resTitle=$this->dom->getElementsByTagName('resTitle')->item(0)->nodeValue;
$this->resAltTitle=$this->dom->getElementsByTagName('resAltTitle')->item(0)->nodeValue;
@$this->resAltTitle=$this->dom->getElementsByTagName('resAltTitle')->item(0)->nodeValue;
$this->idAbs=$this->dom->getElementsByTagName('idAbs')->item(0)->nodeValue;
$this->mdFileID=$this->dom->getElementsByTagName('mdFileID')->item(0)->nodeValue;
$this->mdDateSt=$this->dom->getElementsByTagName('mdDateSt')->item(0)->nodeValue;
@ -335,7 +335,7 @@ class ISO19115
//项目支持信息
@$this->suppinfo=$this->dom->getElementsByTagName('suppInfo')->item(0)->nodeValue;
//DOI，自定义项
$cittype=$this->dom->getElementsByTagName('citIdType')->item(0)->nodeValue;
@$cittype=$this->dom->getElementsByTagName('citIdType')->item(0)->nodeValue;
if ($cittype=='DOI')
$this->doi=$this->dom->getElementsByTagName('citId')->item(0)->nodeValue;
//数据大小，以MB为单位
@ -357,13 +357,13 @@ class ISO19115
$this->author[$k]['individual']=$author->getElementsByTagName('rpIndName')->item(0)->nodeValue;
$this->author[$k]['organisation']=$author->getElementsByTagName('rpOrgName')->item(0)->nodeValue;
$this->author[$k]['position']=$author->getElementsByTagName('rpPosName')->item(0)->nodeValue;
$this->author[$k]['delivery']=$author->getElementsByTagName('delPoint')->item(0)->nodeValue;
@$this->author[$k]['delivery']=$author->getElementsByTagName('delPoint')->item(0)->nodeValue;
$this->author[$k]['phone']=$author->getElementsByTagName('voiceNum')->item(0)->nodeValue;
$this->author[$k]['email']=$author->getElementsByTagName('eMailAdd')->item(0)->nodeValue;
$this->author[$k]['postal']=$author->getElementsByTagName('postCode')->item(0)->nodeValue;
$this->author[$k]['city']=$author->getElementsByTagName('city')->item(0)->nodeValue;
$this->author[$k]['administrative']=$author->getElementsByTagName('adminArea')->item(0)->nodeValue;
$this->author[$k]['country']=$author->getElementsByTagName('country')->item(0)->nodeValue;
@$this->author[$k]['country']=$author->getElementsByTagName('country')->item(0)->nodeValue;
@$this->author[$k]['role']=$author->getElementsByTagName('RoleCd')->item(0)->attributes->getNamedItem('value')->nodeValue;
}
$cnt=$k+1;