diff --git a/application/default/controllers/ServiceController.php b/application/default/controllers/ServiceController.php index a8301e89..1167a21d 100644 --- a/application/default/controllers/ServiceController.php +++ b/application/default/controllers/ServiceController.php @@ -314,11 +314,8 @@ class ServiceController extends Zend_Controller_Action $citation=$row['mcitation']; } else if ($row['citation']) { - if (empty($row['datadoi'])) - { - $citation=$row['citation']; - } - elseif (!strpos($row['citation'],$row['datadoi'])) + $citation=$row['citation']; + if (!empty($row['datadoi']) && !strpos($row['citation'],$row['datadoi'])) { $citation='
  • 文章引用:'.$row['citation'].'
  • '; $citation.="
  • 数据的引用:"; @@ -722,11 +719,8 @@ class ServiceController extends Zend_Controller_Action $cit=$row['mcitation']; } else if ($row['citation']) { - if (empty($row['datadoi'])) - { - $cit=$row['citation']; - } - elseif (!strpos($row['citation'],$row['datadoi'])) + $cit=$row['citation']; + if (!empty($row['datadoi']) && !strpos($row['citation'],$row['datadoi'])) { $cit='文章引用:'.$row['citation']; $cit.="\r\n数据的引用:";