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

修正docAction和odtAction中数据引用方式的逻辑错误

This commit is contained in:
wlx 2014-02-25 04:12:57 +00:00
parent f99e98f2c7
commit 70eb46f541
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/default/controllers/ServiceController.php
View File

@ -314,11 +314,8 @@ class ServiceController extends Zend_Controller_Action
$citation=$row['mcitation']; $citation=$row['mcitation'];
} else if ($row['citation']) } else if ($row['citation'])
{ {
if (empty($row['datadoi'])) $citation=$row['citation'];
{ if (!empty($row['datadoi']) && !strpos($row['citation'],$row['datadoi']))
$citation=$row['citation'];
}
elseif (!strpos($row['citation'],$row['datadoi']))
{ {
$citation='<li>文章引用：'.$row['citation'].'</li>'; $citation='<li>文章引用：'.$row['citation'].'</li>';
$citation.="<li>数据的引用："; $citation.="<li>数据的引用：";
@ -722,11 +719,8 @@ class ServiceController extends Zend_Controller_Action
$cit=$row['mcitation']; $cit=$row['mcitation'];
} else if ($row['citation']) } else if ($row['citation'])
{ {
if (empty($row['datadoi'])) $cit=$row['citation'];
{ if (!empty($row['datadoi']) && !strpos($row['citation'],$row['datadoi']))
$cit=$row['citation'];
}
elseif (!strpos($row['citation'],$row['datadoi']))
{ {
$cit='文章引用：'.$row['citation']; $cit='文章引用：'.$row['citation'];
$cit.="\r\n数据的引用："; $cit.="\r\n数据的引用：";