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

merge heihedata branch from r4221 to r4235 into trunk

This commit is contained in:
wlx 2014-02-26 01:55:33 +00:00
parent e5e8f4b9d1
commit 336882754a
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -313,12 +313,9 @@ 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']))
if (!empty($row['datadoi']) && !strpos($row['citation'],$row['datadoi']))
{
$citation='<li>文章引用：'.$row['citation'].'</li>';
$citation.="<li>数据的引用：";
@ -721,12 +718,9 @@ 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']))
if (!empty($row['datadoi']) && !strpos($row['citation'],$row['datadoi']))
{
$cit='文章引用：'.$row['citation'];
$cit.="\r\n数据的引用：";

4
data/doc.xsl
View File

@ -111,6 +111,10 @@
<li>结束时间：<xsl:value-of select="end"/></li>
</xsl:for-each>
</ol>
<ol><xsl:for-each select="//Metadata/dataIdInfo/dataExt/tempEle/TempExtent/exTemp/TM_GeometricPrimitive/TM_Instant">
<li>日期：<xsl:value-of select="//tmPosition/TM_CalDate/calDate"/></li>
</xsl:for-each>
</ol>
</li>
<li><h4 style="background-color:#DEE2E4">本数据的引用</h4>
<ol>