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

fix search error and omit warning info

This commit is contained in:
wlx 2012-07-12 04:08:28 +00:00
parent 8efb86e597
commit 189ca93957
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/default/controllers/AuthorController.php
View File

@ -379,7 +379,7 @@ class AuthorController extends Zend_Controller_Action
LEFT JOIN mdauthor a ON m.uuid=a.uuid LEFT JOIN mdauthor a ON m.uuid=a.uuid
LEFT JOIN geonetworkmetadata g on m.uuid=g.uuid LEFT JOIN geonetworkmetadata g on m.uuid=g.uuid
LEFT JOIN mdstatus mds ON m.uuid=mds.uuid LEFT JOIN mdstatus mds ON m.uuid=mds.uuid
WHERE a.userid=? AND a.status>=0"; WHERE a.userid=? AND a.status>=0 ";
if ($ac=='search') if ($ac=='search')
{ {
$key = trim($this->_request->getParam('q')); $key = trim($this->_request->getParam('q'));
@ -388,7 +388,7 @@ class AuthorController extends Zend_Controller_Action
$where=$search->sql_expr(array("m.title","m.description")); $where=$search->sql_expr(array("m.title","m.description"));
$sql.=' and '.$where; $sql.=' and '.$where;
} }
$sql.="ORDER BY a.status DESC,a.id DESC"; $sql.=" ORDER BY a.status DESC,a.id DESC";
$sth = $this->db->prepare($sql); $sth = $this->db->prepare($sql);
$sth->execute(array($u_id)); $sth->execute(array($u_id));
@ -1726,7 +1726,7 @@ class AuthorController 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));
@ -1780,7 +1780,7 @@ class AuthorController 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));
@ -1819,7 +1819,7 @@ class AuthorController 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,'西部数据中心服务组');
@ -1948,7 +1948,7 @@ class AuthorController 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));